Merge lp:~hggdh2/ubuntu-server-iso-testing/d-i-question-will-be-asked into lp:ubuntu-server-iso-testing

[C de-Avillez]

Added a check on run-test.py -- if debian-installer prints 'question will be asked' then end test run -- nothing will happen, anymore, since user input is required. This change has been running on wazn for the last 4 days.

[lp:~hggdh2/ubuntu-server-iso-testing/d-i-question-will-be-asked]

240. By C de-Avillez on 2011-08-16

run-test.py: really. If I set a def with a variable being passed, I should use it. Sigh. Thanks to Jean-Baptiste for spotting the obvious

[Jean-Baptiste Lallement (jibel)]

looks good. thanks.

review: Approve

=== modified file 'run-test.py'
--- run-test.py	2011-08-11 13:42:45 +0000
+++ run-test.py	2011-08-16 15:53:23 +0000
@@ -557,6 +557,19 @@
     output = proc.communicate()[0].strip()
     return output
 
+def check_for_errors(di_syslog):
+    if di_syslog is None:
+        # nothing to check on
+        return False
+    if "question will be asked" in di_syslog:
+        return True
+
+def end_VM(VM_id):
+    logging.debug("Terminating test case %s" % (VM_id))
+    cmd = [ "virsh", "destroy", VM_id]]
+    logging.debug("Cmd: %s" % (cmd))
+    subprocess.check_call(cmd)
+
 start_time = time.time()
 while True:
     if l_ipAddress is None:
@@ -567,6 +580,10 @@
         # if no different for a while, d-i stalled?
         l_output = get_diSyslog(test['_id'], l_ipAddress)
         logging.debug(l_output)
+        if check_for_errors(l_output):
+            logging.info("Test %s: debian-installer reports error" % test['_id'])
+            end_VM(test['_id'])
+            break
 
     logging.debug("Checking VM state for test case %s" % test['_id'])
     cmd = [ "virsh", "domstate", test['_id']]
@@ -582,10 +599,7 @@
         break
     elif start_time + TEST_TIMEOUT < time.time():
         logging.debug("Test %s failed to execute within %d minutes" % (test['_id'], TEST_TIMEOUT / 60))
-        logging.debug("Terminating test case %s" % (test['_id']))
-        cmd = [ "virsh", "destroy", test['_id']]
-        logging.debug("Cmd: %s" % (cmd))
-        subprocess.check_call(cmd)
+        end_VM(test['_id'])
         break
     else:
         # Have another look in SLEEP_TIME seconds