[1/2,RESEND] KVM Test: Introduce qmp_monitor property in 'kvm_vm.VM'

Commit Message

[e-mail] Jan. 10, 2011, 10:47 a.m. UTC

None

Patch

diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index f6f1684..0ba2db4 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -870,6 +870,16 @@  class VM:
         if self.monitors and not self.params.get("main_monitor"):
             return self.monitors[0]
 
+    @property
+    def qmp_monitor(self):
+        """
+        Return the first QMP monitor.
+        If no QMP monitor exist, return None.
+        """
+        for m in self.monitors:
+            if isinstance(m, kvm_monitor.QMPMonitor):
+                return m
+        return None
 
     def is_alive(self):
         """
diff --git a/client/tests/kvm/tests/qmp_basic.py b/client/tests/kvm/tests/qmp_basic.py
index 985ad15..36cbd78 100644
--- a/client/tests/kvm/tests/qmp_basic.py
+++ b/client/tests/kvm/tests/qmp_basic.py
@@ -383,13 +383,16 @@  def run_qmp_basic(test, params, env):
 
     vm = kvm_test_utils.get_living_vm(env, params.get("main_vm"))
 
+    if vm.qmp_monitor is None:
+        raise error.TestError("Could not find a QMP monitor, abort test.")
+
     # Run all suites
-    greeting_suite(vm.monitor)
-    input_object_suite(vm.monitor)
-    argument_checker_suite(vm.monitor)
-    unknown_commands_suite(vm.monitor)
-    json_parsing_errors_suite(vm.monitor)
+    greeting_suite(vm.qmp_monitor)
+    input_object_suite(vm.qmp_monitor)
+    argument_checker_suite(vm.qmp_monitor)
+    unknown_commands_suite(vm.qmp_monitor)
+    json_parsing_errors_suite(vm.qmp_monitor)
 
     # check if QMP is still alive
-    if not vm.monitor.is_responsive():
+    if not vm.qmp_monitor.is_responsive():
         raise error.TestFail('QEMU is not alive after QMP testing')