Re: [KVM-AUTOTEST PATCH 7/7] [RFC] KVM test: migrate_cancel: allow for alternative spellings of 'cancelled'

[Lucas Meneghel Rodrigues <lmr@redhat.com>]

On Sun, 2010-10-24 at 13:01 +0200, Michael Goldish wrote:
> Is there any chance someone will decide to switch over to the American spelling?

This is mainly harmless. Even if the switch won't happen, this is
absolutely fine, thanks!

> Signed-off-by: Michael Goldish <mgoldish@redhat.com>
> ---
>  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,