[Autotest] [PATCH 3/4] Add serial login into kvm_test_utils.wait_for_login()

[Amos Kong]

Signed-off-by: Amos Kong <ak...@redhat.com>
---
 0 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/client/tests/kvm/kvm_test_utils.py 
b/client/tests/kvm/kvm_test_utils.py
index 585e194..da93be7 100644
--- a/client/tests/kvm/kvm_test_utils.py
+++ b/client/tests/kvm/kvm_test_utils.py
@@ -44,7 +44,7 @@ def get_living_vm(env, vm_name):
     return vm
 
 
-def wait_for_login(vm, nic_index=0, timeout=240, start=0, step=2):
+def wait_for_login(vm, nic_index=0, timeout=240, start=0, step=2, serial=None):
     """
     Try logging into a VM repeatedly.  Stop on success or when timeout expires.
 
@@ -54,8 +54,13 @@ def wait_for_login(vm, nic_index=0, timeout=240, start=0, 
step=2):
     @return: A shell session object.
     """
     logging.info("Trying to log into guest '%s', timeout %ds", vm.name, 
timeout)
-    session = kvm_utils.wait_for(lambda: vm.remote_login(nic_index=nic_index),
-                                 timeout, start, step)
+    if serial:
+        logging.info("Try to log into guest by serial")
+        session = kvm_utils.wait_for(lambda: vm.serial_login(), timeout,
+                                     start, step)
+    else:
+        session = kvm_utils.wait_for(lambda: vm.remote_login(
+                  nic_index=nic_index), timeout, start, step)
     if not session:
         raise error.TestFail("Could not log into guest '%s'" % vm.name)
     logging.info("Logged into guest '%s'" % vm.name)

_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest