From 38f618d4d516aab4804a919f29578665e7493791 Mon Sep 17 00:00:00 2001 From: Christian Henkel <6976069+ct2034@users.noreply.github.com> Date: Fri, 22 May 2026 10:32:55 +0200 Subject: [PATCH 1/2] cpu monitor fix (#618) Signed-off-by: Christian Henkel (cherry picked from commit fa062d0da91ddd7e4776cbb0965220cff6b9422a) # Conflicts: # diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py --- .../test/systemtest/test_cpu_monitor.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py b/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py index 28430c482..bc90f7442 100644 --- a/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py +++ b/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py @@ -62,8 +62,15 @@ def setUp(self): time.sleep(0.1) def diagnostics_callback(self, msg): +<<<<<<< HEAD self.message_recieved = True self.assertEqual(len(msg.status), 1) +======= + if len(msg.status) > 0: + self.message_recieved = True + else: + print('Received diagnostics message with no status entries') +>>>>>>> fa062d0 (cpu monitor fix (#618)) def test_ok(self): warning_percentage = 100 From df6bf0634767702f3020dd6867032d43ff241258 Mon Sep 17 00:00:00 2001 From: Christian Henkel Date: Fri, 22 May 2026 10:36:20 +0200 Subject: [PATCH 2/2] fix conflict Signed-off-by: Christian Henkel --- .../test/systemtest/test_cpu_monitor.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py b/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py index bc90f7442..92c23570f 100644 --- a/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py +++ b/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py @@ -62,15 +62,10 @@ def setUp(self): time.sleep(0.1) def diagnostics_callback(self, msg): -<<<<<<< HEAD - self.message_recieved = True - self.assertEqual(len(msg.status), 1) -======= if len(msg.status) > 0: self.message_recieved = True else: print('Received diagnostics message with no status entries') ->>>>>>> fa062d0 (cpu monitor fix (#618)) def test_ok(self): warning_percentage = 100