Is there any chance someone will decide to switch over to the American spelling?
Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
---
client/tests/kvm/kvm_test_utils.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/client/tests/kvm/kvm_test_utils.py b/client/tests/kvm/kvm_test_utils.py
index 1bb8920..a3b182b 100644
--- a/client/tests/kvm/kvm_test_utils.py
+++ b/client/tests/kvm/kvm_test_utils.py
@@ -157,9 +157,11 @@ def migrate(vm, env=None, mig_timeout=3600, mig_protocol="tcp",
def mig_cancelled():
o = vm.monitor.info("migrate")
if isinstance(o, str):
- return "Migration status: cancelled" in o
+ return ("Migration status: cancelled" in o or
+ "Migration status: canceled" in o)
else:
- return o.get("status") == "cancelled"
+ return (o.get("status") == "cancelled" or
+ o.get("status") == "canceled")
def wait_for_migration():
if not kvm_utils.wait_for(mig_finished, mig_timeout, 2, 2,
--
1.5.5.6
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
