From 041aee09d8fbf1910efdec12e08ce4daa68ee722 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 18 2020 12:26:00 +0000
Subject: Have the tests return the MonitorUtils object instead of the logs


This allows to store more things in the object and access them from the
runner.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/monitor_gating_multi_builds.py b/monitor_gating_multi_builds.py
index 441b015..18648d3 100644
--- a/monitor_gating_multi_builds.py
+++ b/monitor_gating_multi_builds.py
@@ -223,7 +223,7 @@ def main(args, utils=None):
             )
 
     utils.finalize(start)
-    return utils.logs
+    return utils
 
 
 if __name__ == "__main__":
diff --git a/monitor_gating_single_build.py b/monitor_gating_single_build.py
index 1156f11..29425b0 100644
--- a/monitor_gating_single_build.py
+++ b/monitor_gating_single_build.py
@@ -303,7 +303,7 @@ def main(args):
             )
 
     utils.finalize(start)
-    return utils.logs
+    return utils
 
 
 if __name__ == "__main__":
diff --git a/runner.py b/runner.py
index 5c68a87..08c3247 100644
--- a/runner.py
+++ b/runner.py
@@ -79,8 +79,8 @@ def schedule(conf):
             topic=f"single-build.start",
             message={"arguments": single_args, "runid": runid},
         )
-        output = monitor_gating_single_build.main(single_args)
-        output_text = "\n".join(output)
+        monit_utils = monitor_gating_single_build.main(single_args)
+        output_text = "\n".join(monit_utils.logs)
         if "[FAILED]" not in output_text:
             result = "succeeded"
         else:
@@ -88,7 +88,7 @@ def schedule(conf):
         notify(
             topic=f"single-build.end.{result}",
             message={
-                "output": output,
+                "output": monit_utils.logs,
                 "output_text": output_text,
                 "result": result,
                 "runid": runid,
@@ -103,11 +103,13 @@ def schedule(conf):
             message={"arguments": multi_args, "runid": runid},
         )
         try:
-            output = monitor_gating_multi_builds.main(multi_args, utils=monit_utils)
+            monit_utils = monitor_gating_multi_builds.main(
+                multi_args, utils=monit_utils
+            )
         finally:
             _clean_up_side_tags(monit_utils)
 
-        output_text = "\n".join(output)
+        output_text = "\n".join(monit_utils.logs)
         if "[FAILED]" not in output_text:
             result = "succeeded"
         else:
@@ -115,7 +117,7 @@ def schedule(conf):
         notify(
             topic=f"multi-build.end.{result}",
             message={
-                "output": output,
+                "output": monit_utils.logs,
                 "output_text": output_text,
                 "result": result,
                 "runid": runid,