From patchwork Sun Oct 24 11:01:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 265452 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9OB1RJ6008706 for ; Sun, 24 Oct 2010 11:01:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932490Ab0JXLB0 (ORCPT ); Sun, 24 Oct 2010 07:01:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62720 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932459Ab0JXLBY (ORCPT ); Sun, 24 Oct 2010 07:01:24 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9OB1NTN023518 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 24 Oct 2010 07:01:23 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9OB1NiE014252; Sun, 24 Oct 2010 07:01:23 -0400 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o9OB1BC9007247; Sun, 24 Oct 2010 07:01:21 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: 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> In-Reply-To: <1287918070-4579-6-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 24 Oct 2010 11:01:28 +0000 (UTC) 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,