From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Goldish Subject: [KVM-AUTOTEST PATCH 7/7] [RFC] KVM test: migrate_cancel: allow for alternative spellings of 'cancelled' Date: Sun, 24 Oct 2010 13:01:10 +0200 Message-ID: <1287918070-4579-7-git-send-email-mgoldish@redhat.com> References: <1287918070-4579-1-git-send-email-mgoldish@redhat.com> <1287918070-4579-2-git-send-email-mgoldish@redhat.com> <1287918070-4579-3-git-send-email-mgoldish@redhat.com> <1287918070-4579-4-git-send-email-mgoldish@redhat.com> <1287918070-4579-5-git-send-email-mgoldish@redhat.com> <1287918070-4579-6-git-send-email-mgoldish@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: In-Reply-To: <1287918070-4579-6-git-send-email-mgoldish@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org Is there any chance someone will decide to switch over to the American spelling? Signed-off-by: Michael Goldish --- 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