[KVM-AUTOTEST PATCH 05/26] KVM test: migration: minor style changes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Mainly moving a logging call from kvm_monitor.py to kvm_vm.py.

Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
---
 client/tests/kvm/kvm_monitor.py |    1 -
 client/tests/kvm/kvm_vm.py      |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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):
-- 
1.7.3.4

--
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


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux