hwsim tests: Refactor test results reporting

Refactor the test reporting to treat the different results
(success/skip/failure) identically. This makes the timing
seem a bit longer, but cleans up the code which will allow
for adding more checks (e.g., on the captured data files)
later.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>

diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py
index 16b5e19b7459663c3f82a2a48c70916fc2657b0e..dea8a8ebe22859b6604d2477c7f786a6e07c2dac 100755 (executable)
--- a/tests/hwsim/run-tests.py
+++ b/tests/hwsim/run-tests.py
@@ -247,32 +247,16 @@ def main():
                     res = t(dev, apdev)
                 else:
                     res = t(dev)
-                end = datetime.now()
-                diff = end - start
                 if res == "skip":
                     skipped.append(name)
                     result = "SKIP"
                 else:
                     passed.append(name)
                     result = "PASS"
-                report(conn, args.build, args.commit, run, name, result, diff)
-                result = result + " " + name + " "
-                result = result + str(diff.total_seconds()) + " " + str(end)
-                logger.info(result)
-                if log_to_file or print_res:
-                    print result
-                    sys.stdout.flush()
             except Exception, e:
-                end = datetime.now()
-                diff = end - start
                 logger.info(e)
+                result = "FAIL"
                 failed.append(name)
-                report(conn, args.build, args.commit, run, name, "FAIL", diff)
-                result = "FAIL " + name + " " + str(diff.total_seconds()) + " " + str(end)
-                logger.info(result)
-                if log_to_file:
-                    print result
-                    sys.stdout.flush()
             for d in dev:
                 try:
                     d.request("NOTE TEST-STOP " + name)
@@ -298,6 +282,16 @@ def main():
                     logger.info("Failed to rename log files")
                     logger.info(e)
 
+        end = datetime.now()
+        diff = end - start
+        report(conn, args.build, args.commit, run, name, result, diff)
+        result = result + " " + name + " "
+        result = result + str(diff.total_seconds()) + " " + str(end)
+        logger.info(result)
+        if log_to_file or print_res:
+            print result
+            sys.stdout.flush()
+
     if log_handler:
         log_handler.stream.close()
         logger.removeHandler(log_handler)