Merge branch 'commaai:master' into PA-testing

Edison-CBS · Jan 21, 2024 · d3a4cf2 · d3a4cf2
2 parents 59abcd4 + e0d0896
commit d3a4cf2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -37,6 +37,7 @@ if [ -f /TICI ]; then
 
   rm -rf /tmp/tmp*
   rm -rf ~/.commacache
+  rm -rf /dev/shm/*
 
   if ! systemctl is-active --quiet systemd-resolved; then
     echo "restarting resolved"

diff --git a/system/hardware/tici/tests/test_power_draw.py b/system/hardware/tici/tests/test_power_draw.py
@@ -91,8 +91,8 @@ def test_camera_procs(self):
       msgs_expected = int(sum(SAMPLE_TIME * SERVICE_LIST[msg].frequency for msg in proc.msgs))
       tab.append([proc.name, round(expected, 2), round(cur, 2), msgs_expected, msgs_received])
       with self.subTest(proc=proc.name):
-        np.testing.assert_allclose(cur, expected, rtol=proc.rtol, atol=proc.atol)
         np.testing.assert_allclose(msgs_expected, msgs_received, rtol=.02, atol=2)
+        np.testing.assert_allclose(cur, expected, rtol=proc.rtol, atol=proc.atol)
     print(tabulate(tab))
     print(f"Baseline {baseline:.2f}W\n")