From patchwork Tue Jan 11 13:13:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 471491 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 p0BDDSje008028 for ; Tue, 11 Jan 2011 13:13:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932093Ab1AKNNV (ORCPT ); Tue, 11 Jan 2011 08:13:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22339 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755993Ab1AKNNS (ORCPT ); Tue, 11 Jan 2011 08:13:18 -0500 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 p0BDDIUZ018220 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 11 Jan 2011 08:13:18 -0500 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 p0BDDHSX022682; Tue, 11 Jan 2011 08:13:17 -0500 Received: from qu0061.eng.lab.tlv.redhat.com ([10.35.16.61]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p0BDD9nR025030; Tue, 11 Jan 2011 08:13:16 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 05/26] KVM test: migration: minor style changes Date: Tue, 11 Jan 2011 15:13:17 +0200 Message-Id: <1294751618-21631-5-git-send-email-mgoldish@redhat.com> In-Reply-To: <1294751618-21631-1-git-send-email-mgoldish@redhat.com> References: <1294751618-21631-1-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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 11 Jan 2011 13:13:29 +0000 (UTC) diff --git a/client/tests/kvm/kvm_monitor.py b/client/tests/kvm/kvm_monitor.py index 6321fbd..23fbc45 100644 --- a/client/tests/kvm/kvm_monitor.py +++ b/client/tests/kvm/kvm_monitor.py @@ -314,7 +314,6 @@ class HumanMonitor(Monitor): @param wait: If true, wait for completion @return: The command's output """ - logging.debug("Migrating to: %s" % uri) cmd = "migrate" if not wait: cmd += " -d" diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 259bb18..4c3ab14 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -1416,7 +1416,7 @@ class VM: def wait_for_migration(): if not kvm_utils.wait_for(mig_finished, timeout, 2, 2, - "Waiting for migration to finish..."): + "Waiting for migration to complete"): raise VMMigrateTimeoutError("Timeout expired while waiting " "for migration to finish") @@ -1446,6 +1446,7 @@ class VM: if offline: self.monitor.cmd("stop") + logging.info("Migrating to %s" % uri) self.monitor.migrate(uri) if cancel_delay: @@ -1487,8 +1488,7 @@ class VM: md5_save1 = utils.hash_file(save1) md5_save2 = utils.hash_file(save2) if md5_save1 != md5_save2: - raise VMMigrateStateMismatchError(md5_save1, - md5_save2) + raise VMMigrateStateMismatchError(md5_save1, md5_save2) finally: if clean: if os.path.isfile(save1):