better onroad test output

selfdrive/test/test_onroad.py

@@ -97,7 +97,8 @@ def cputime_total(ct):
 
 
 def check_cpu_usage(first_proc, last_proc):
-  result =  "------------------------------------------------\n"
+  result = "\n"
+  result += "------------------------------------------------\n"
   result += "------------------ CPU Usage -------------------\n"
   result += "------------------------------------------------\n"
 
@@ -112,10 +113,9 @@ def check_cpu_usage(first_proc, last_proc):
       cpu_usage = cpu_time / dt * 100.
       if cpu_usage > max(normal_cpu_usage * 1.15, normal_cpu_usage + 5.0):
         # cpu usage is high while playing sounds
-        if proc_name == "./_soundd" and cpu_usage < 65.:
-          continue
-        result += f"Warning {proc_name} using more CPU than normal\n"
-        r = False
+        if not (proc_name == "./_soundd" and cpu_usage < 65.):
+          result += f"Warning {proc_name} using more CPU than normal\n"
+          r = False
       elif cpu_usage < min(normal_cpu_usage * 0.65, max(normal_cpu_usage - 1.0, 0.0)):
         result += f"Warning {proc_name} using less CPU than normal\n"
         r = False
@@ -201,7 +201,8 @@ def test_cpu_usage(self):
     self.assertTrue(cpu_ok)
 
   def test_model_execution_timings(self):
-    result =  "------------------------------------------------\n"
+    result = "\n"
+    result += "------------------------------------------------\n"
     result += "----------------- Model Timing -----------------\n"
     result += "------------------------------------------------\n"
     # TODO: this went up when plannerd cpu usage increased, why?
@@ -212,12 +213,15 @@ def test_model_execution_timings(self):
       self.assertLess(np.mean(ts), avg_max, f"high avg '{s}' execution time: {np.mean(ts)}")
       result += f"'{s}' execution time: {min(ts)}\n"
       result += f"'{s}' avg execution time: {np.mean(ts)}\n"
+    result += "------------------------------------------------\n"
     print(result)
 
   def test_timings(self):
-
-    print("\n\n")
-    print("="*25, "service timings", "="*25)
+    passed = True
+    result = "\n"
+    result += "------------------------------------------------\n"
+    result += "----------------- Service Timings --------------\n"
+    result += "------------------------------------------------\n"
     for s, (maxmin, rsd) in TIMINGS.items():
       msgs = [m.logMonoTime for m in self.lr if m.which() == s]
       if not len(msgs):
@@ -226,12 +230,22 @@ def test_timings(self):
       ts = np.diff(msgs) / 1e9
       dt = 1 / service_list[s].frequency
 
-      np.testing.assert_allclose(np.mean(ts), dt, rtol=0.03, err_msg=f"{s} - failed mean timing check")
-      np.testing.assert_allclose([np.max(ts), np.min(ts)], dt, rtol=maxmin, err_msg=f"{s} - failed max/min timing check")
-      self.assertLess(np.std(ts) / dt, rsd, msg=f"{s} - failed RSD timing check")
-      print(f"{s}: {np.array([np.mean(ts), np.max(ts), np.min(ts)])*1e3}")
-      print(f"     {np.max(np.absolute([np.max(ts)/dt, np.min(ts)/dt]))} {np.std(ts)/dt}")
-    print("="*67)
+      try:
+        np.testing.assert_allclose(np.mean(ts), dt, rtol=0.03, err_msg=f"{s} - failed mean timing check")
+        np.testing.assert_allclose([np.max(ts), np.min(ts)], dt, rtol=maxmin, err_msg=f"{s} - failed max/min timing check")
+      except Exception as e:
+        result += str(e) + "\n"
+        passed = False
+
+      if np.std(ts) / dt > rsd:
+        result += f"{s} - failed RSD timing check\n"
+        passed = False
+
+      result += f"{s.ljust(40)}: {np.array([np.mean(ts), np.max(ts), np.min(ts)])*1e3}\n"
+      result += f"{''.ljust(40)}  {np.max(np.absolute([np.max(ts)/dt, np.min(ts)/dt]))} {np.std(ts)/dt}\n"
+    result += "="*67
+    print(result)
+    self.assertTrue(passed)
 
   @release_only
   def test_startup(self):