tests: runtime: Print BEFORE/AFTER logs on CLEANUP failure

CLEANUP can fail if BEFORE/AFTER commands fail. Thus, we should print
their logs on CLEANUP failure to assist with debugging.

Author: danobi

tests/runtime/engine/runner.py

@@ -496,11 +496,6 @@ def found_all_children(lines):
                     os.killpg(os.getpgid(after.pid), signal.SIGKILL)
                     after_output = after.communicate()[0]
 
-        if test.cleanup:
-                cleanup = Runner.__setup_cleanup(test, setup=False)
-                if cleanup:
-                    return cleanup
-
         def to_utf8(s):
             return s.encode("unicode_escape").decode("utf-8")
 
@@ -511,6 +506,12 @@ def print_befores_and_after_output():
             if after_output is not None:
                 print(f"\tAfter cmd output: {to_utf8(after_output)}")
 
+        if test.cleanup:
+                cleanup = Runner.__setup_cleanup(test, setup=False)
+                if cleanup:
+                    print_befores_and_after_output()
+                    return cleanup
+
         elapsed = math.ceil((time.time() - start_time) * 1000)
         label = f"{test.suite}.{test.name} ({elapsed} ms)"