From 618b28fa2e98a4e954398b6b83b2236f4e85ac20 Mon Sep 17 00:00:00 2001 From: Syed Raza Date: Wed, 6 May 2020 11:01:04 -0400 Subject: [PATCH 1/2] Possible fix for tests sometimes failing --- test/simplecyclic_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/simplecyclic_test.py b/test/simplecyclic_test.py index 4e41e5e03..e522468a0 100644 --- a/test/simplecyclic_test.py +++ b/test/simplecyclic_test.py @@ -168,6 +168,7 @@ def test_thread_based_cyclic_send_task(self): on_error_mock.assert_not_called() task.stop() bus.shutdown() + sleep(.5) # bus has been shutted down on_error_mock.reset_mock() From fe872ce92c85bf8e403e3a1c7f7715a8e8475b9a Mon Sep 17 00:00:00 2001 From: Syed Raza Date: Wed, 6 May 2020 11:13:39 -0400 Subject: [PATCH 2/2] Same idea as before but faster --- test/simplecyclic_test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/simplecyclic_test.py b/test/simplecyclic_test.py index e522468a0..927855867 100644 --- a/test/simplecyclic_test.py +++ b/test/simplecyclic_test.py @@ -168,10 +168,9 @@ def test_thread_based_cyclic_send_task(self): on_error_mock.assert_not_called() task.stop() bus.shutdown() - sleep(.5) # bus has been shutted down - on_error_mock.reset_mock() + on_error_mock = MagicMock(return_value=False) task = can.broadcastmanager.ThreadBasedCyclicSendTask( bus, bus._lock_send_periodic, msg, 0.1, 3, on_error_mock )