Merge lp:~james-page/ubuntu-server-iso-testing/reboot-testing-fixes into lp:ubuntu-server-iso-testing

[James Page]

Fixup handling of errors on timeout of testing.

[Jean-Baptiste Lallement (jibel)]

approved. thanks

review: Approve

=== modified file 'run-test.py'
--- run-test.py	2012-03-14 10:12:08 +0000
+++ run-test.py	2012-03-15 09:58:18 +0000
@@ -700,7 +700,7 @@
 if not os.path.exists(testresultsdir):
     os.makedirs(testresultsdir)
 
-if test['states'].has_key('tested'):
+if test['states'].has_key('tested') and test.has_key('results'):
     # Testing appears to have completed - VM ran and run_tests
     # execute and wrote to CouchDB
     # Retrieve log output an place in hudson workspace
@@ -719,10 +719,10 @@
         f.close()
     test_completed = True
 else:
-    logging.debug("VM for test case %s powered off but tests not completed" % test['_id'])
+    logging.error("VM for test case %s powered off but tests not completed" % test['_id'])
 
-if test['states'].has_key('rebooted'):
-    logging.debug("Test case %s rebooted." % test['_id'])
+if test['states'].has_key('rebooted') and test.has_key('post-reboot-results'):
+    logging.debug("Reboot tests completed for test case %s" % test['_id'])
     post_reboot_results = test['post-reboot-results']
     for test_result in post_reboot_results:
         logging.debug("Storing results for test %s", test_result)
@@ -734,6 +734,8 @@
         f = open (test_results_file, 'w')
         f.write(test['post-reboot-results'][test_result]['script_stdout'])
         f.close()
+elif test['states'].has_key('rebooted') and not test.has_key('post-reboot-results'):
+    logging.error("VM for test case %s rebooted but reboot tests not completed", test['_id'])
 
 # save D-I logs no matter what (if they exist, of course)
 if os.path.isfile(syslog_path):