From c7b56792935d8dc3e4432a21356ed2535b949292 Mon Sep 17 00:00:00 2001 From: sezanzeb Date: Thu, 19 Nov 2020 11:44:07 +0100 Subject: [PATCH] made injector constructor test safer --- tests/testcases/injector.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/testcases/injector.py b/tests/testcases/injector.py index 9ac3d328..edfa1a12 100644 --- a/tests/testcases/injector.py +++ b/tests/testcases/injector.py @@ -104,10 +104,19 @@ class TestInjector(unittest.TestCase): # already be enough pending_events['device 2'] = [Event(1, 1, 1)] * 10 - injector2 = KeycodeInjector('device 2') - self.assertEqual(len(injector2.processes), 1) - self.assertEqual(injector2.processes[0].is_alive(), True) - injector2.processes[0].join() + injector2 = None + try: + injector2 = KeycodeInjector('device 2') + self.assertEqual(len(injector2.processes), 1) + self.assertEqual(injector2.processes[0].is_alive(), True) + injector2.processes[0].join() + except Exception as e: + # make sure to not cause race conditions for other tests + # if this test fails + if injector2 is not None: + for p in injector2.processes: + p.join() + raise e def test_injector(self): device = get_devices()['device 2']