[AUTOTEST] print login command and change some timeout values

Commit Message

sudhir kumar July 24, 2009, 11:28 a.m. UTC

This patch does two small things.
1. Prints the guest login command to debug messages.
2. Changes the guest login timeout to 240 seconds. I see the timeout for
*.wait_for() functions in boot test is 240 seconds, while in reboot is 120
seconds which causes the test to fail. We might have missed it by mistake.
240 seconds is a reasonable timeout duration. This patch fixes that.

Signed-off-by: Sudhir Kumar <[e-mail]>

Patch

Index: autotest/client/tests/kvm/kvm_utils.py
===================================================================
--- autotest.orig/client/tests/kvm/kvm_utils.py
+++ autotest/client/tests/kvm/kvm_utils.py
@@ -637,6 +637,7 @@  def remote_login(command, password, prom
     password_prompt_count = 0

     logging.debug("Trying to login...")
+    logging.debug("Guest login Command: %s" % command)

     while True:
         (match, text) = sub.read_until_last_line_matches(
Index: autotest/client/tests/kvm/kvm_tests.py
===================================================================
--- autotest.orig/client/tests/kvm/kvm_tests.py
+++ autotest/client/tests/kvm/kvm_tests.py
@@ -48,7 +48,7 @@  def run_boot(test, params, env):

         logging.info("Guest is down; waiting for it to go up again...")

-        session = kvm_utils.wait_for(vm.ssh_login, 120, 0, 2)
+        session = kvm_utils.wait_for(vm.ssh_login, 240, 0, 2)
         if not session:
             raise error.TestFail("Could not log into guest after reboot")

@@ -88,7 +88,7 @@  def run_shutdown(test, params, env):

     logging.info("Shutdown command sent; waiting for guest to go down...")

-    if not kvm_utils.wait_for(vm.is_dead, 120, 0, 1):
+    if not kvm_utils.wait_for(vm.is_dead, 240, 0, 1):
         raise error.TestFail("Guest refuses to go down")

     logging.info("Guest is down")
@@ -445,7 +445,7 @@  def run_yum_update(test, params, env):

     logging.info("Logging into guest...")

-    session = kvm_utils.wait_for(vm.ssh_login, 120, 0, 2)
+    session = kvm_utils.wait_for(vm.ssh_login, 240, 0, 2)
     if not session:
         message = "Could not log into guest"
         logging.error(message)