Skip to content

Commit cd3fd2d

Browse files
jkonecny12jkonecny12
authored
Merge pull request #112 from jkonecny12/master-fix-global-configuration-test
Fix unit tests when launched by pytest
2 parents 033650e + ce4ea8b commit cd3fd2d

File tree

6 files changed

+129
-126
lines changed

6 files changed

+129
-126
lines changed

‎tests/units/main/event_loop_test.py‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ def test_simple_register_handler(self):
6363
self.callback_called = False
6464

6565
loop = self.loop
66-
loop.register_signal_handler(TestSignal, self._handler_callback)
67-
loop.enqueue_signal(TestSignal())
66+
loop.register_signal_handler(SignalMock, self._handler_callback)
67+
loop.enqueue_signal(SignalMock())
6868
loop.process_signals()
6969

7070
self.assertTrue(self.callback_called)
@@ -73,10 +73,10 @@ def test_process_more_signals(self):
7373
self.signal_counter = 0
7474

7575
loop = self.loop
76-
loop.register_signal_handler(TestSignal, self._handler_signal_counter)
77-
loop.enqueue_signal(TestSignal())
78-
loop.enqueue_signal(TestSignal())
79-
loop.enqueue_signal(TestSignal())
76+
loop.register_signal_handler(SignalMock, self._handler_signal_counter)
77+
loop.enqueue_signal(SignalMock())
78+
loop.enqueue_signal(SignalMock())
79+
loop.enqueue_signal(SignalMock())
8080
loop.process_signals()
8181

8282
self.assertEqual(self.signal_counter, 3)
@@ -85,29 +85,29 @@ def test_process_signals_multiple_times(self):
8585
self.signal_counter = 0
8686

8787
loop = self.loop
88-
loop.register_signal_handler(TestSignal, self._handler_signal_counter)
89-
loop.enqueue_signal(TestSignal())
90-
loop.enqueue_signal(TestSignal())
88+
loop.register_signal_handler(SignalMock, self._handler_signal_counter)
89+
loop.enqueue_signal(SignalMock())
90+
loop.enqueue_signal(SignalMock())
9191
loop.process_signals()
9292
self.assertEqual(self.signal_counter, 2)
9393

94-
loop.enqueue_signal(TestSignal())
95-
loop.enqueue_signal(TestSignal())
94+
loop.enqueue_signal(SignalMock())
95+
loop.enqueue_signal(SignalMock())
9696
loop.process_signals()
9797
self.assertEqual(self.signal_counter, 4)
9898

9999
def test_wait_on_signal(self):
100100
self.signal_counter = 0
101101

102102
loop = self.loop
103-
loop.register_signal_handler(TestSignal,
103+
loop.register_signal_handler(SignalMock,
104104
self._handler_signal_counter)
105-
loop.register_signal_handler(TestSignal2,
105+
loop.register_signal_handler(SignalMock2,
106106
self._handler_process_events_then_register_testsignal,
107107
loop)
108-
loop.enqueue_signal(TestSignal())
109-
loop.enqueue_signal(TestSignal2())
110-
loop.process_signals(return_after=TestSignal2)
108+
loop.enqueue_signal(SignalMock())
109+
loop.enqueue_signal(SignalMock2())
110+
loop.process_signals(return_after=SignalMock2)
111111
self.assertEqual(self.signal_counter, 1)
112112

113113
loop.process_signals()
@@ -117,17 +117,17 @@ def test_wait_on_signal_skipped_by_inner_process_events(self):
117117
self.signal_counter = 0
118118

119119
loop = self.loop
120-
loop.register_signal_handler(TestSignal,
120+
loop.register_signal_handler(SignalMock,
121121
self._handler_signal_counter)
122122
# run process signals recursively in this handler which will skip processing
123-
loop.register_signal_handler(TestSignal2,
123+
loop.register_signal_handler(SignalMock2,
124124
self._handler_process_events_then_register_testsignal,
125125
loop)
126-
loop.enqueue_signal(TestSignal2())
127-
loop.enqueue_signal(TestSignal())
126+
loop.enqueue_signal(SignalMock2())
127+
loop.enqueue_signal(SignalMock())
128128
# new signal will be registered in handler method but that shouldn't be processed
129129
# because it should end on the first signal even when it was skipped
130-
loop.process_signals(return_after=TestSignal)
130+
loop.process_signals(return_after=SignalMock)
131131

132132
self.assertEqual(self.signal_counter, 1)
133133

@@ -136,10 +136,10 @@ def test_multiple_handlers_to_signal(self):
136136
self.signal_counter2 = 0
137137

138138
loop = self.loop
139-
loop.register_signal_handler(TestSignal, self._handler_signal_counter)
140-
loop.register_signal_handler(TestSignal, self._handler_signal_counter2)
141-
loop.enqueue_signal(TestSignal())
142-
loop.enqueue_signal(TestSignal())
139+
loop.register_signal_handler(SignalMock, self._handler_signal_counter)
140+
loop.register_signal_handler(SignalMock, self._handler_signal_counter2)
141+
loop.enqueue_signal(SignalMock())
142+
loop.enqueue_signal(SignalMock())
143143
loop.process_signals()
144144

145145
self.assertEqual(self.signal_counter, 2)
@@ -149,13 +149,13 @@ def test_priority_signal_processing(self):
149149
self.signal_counter = 0
150150

151151
loop = self.loop
152-
loop.register_signal_handler(TestSignal, self._handler_signal_counter)
153-
loop.register_signal_handler(TestPrioritySignal, self._handler_signal_counter)
154-
loop.enqueue_signal(TestSignal())
155-
loop.enqueue_signal(TestSignal())
152+
loop.register_signal_handler(SignalMock, self._handler_signal_counter)
153+
loop.register_signal_handler(PrioritySignalMock, self._handler_signal_counter)
154+
loop.enqueue_signal(SignalMock())
155+
loop.enqueue_signal(SignalMock())
156156
# should be processed as first signal because of priority
157-
loop.enqueue_signal(TestPrioritySignal())
158-
loop.enqueue_signal(TestSignal())
157+
loop.enqueue_signal(PrioritySignalMock())
158+
loop.enqueue_signal(SignalMock())
159159
loop.process_signals()
160160
self.assertEqual(self.signal_counter, 1)
161161

@@ -168,12 +168,12 @@ def test_low_priority_signal_processing(self):
168168
self.signal_counter_copied = 0
169169

170170
loop = self.loop
171-
loop.register_signal_handler(TestSignal, self._handler_signal_counter)
172-
loop.register_signal_handler(TestLowPrioritySignal, self._handler_signal_copy_counter)
173-
loop.enqueue_signal(TestSignal())
174-
loop.enqueue_signal(TestLowPrioritySignal())
175-
loop.enqueue_signal(TestSignal())
176-
loop.enqueue_signal(TestSignal())
171+
loop.register_signal_handler(SignalMock, self._handler_signal_counter)
172+
loop.register_signal_handler(LowPrioritySignalMock, self._handler_signal_copy_counter)
173+
loop.enqueue_signal(SignalMock())
174+
loop.enqueue_signal(LowPrioritySignalMock())
175+
loop.enqueue_signal(SignalMock())
176+
loop.enqueue_signal(SignalMock())
177177
loop.process_signals()
178178
self.assertEqual(self.signal_counter, 3)
179179

@@ -188,8 +188,8 @@ def test_quit_callback(self):
188188

189189
loop = self.loop
190190
loop.set_quit_callback(self._handler_quit_callback, args=msg)
191-
loop.register_signal_handler(TestSignal, self._handler_raise_ExitMainLoop_exception)
192-
loop.enqueue_signal(TestSignal())
191+
loop.register_signal_handler(SignalMock, self._handler_raise_ExitMainLoop_exception)
192+
loop.enqueue_signal(SignalMock())
193193
loop.run()
194194

195195
self.assertTrue(self.callback_called)
@@ -199,10 +199,10 @@ def test_force_quit(self):
199199
self.callback_called = False
200200

201201
loop = self.loop
202-
loop.register_signal_handler(TestSignal, self._handler_callback)
203-
loop.register_signal_handler(TestSignal2, self._handler_force_quit_exception)
204-
loop.enqueue_signal(TestSignal2())
205-
loop.enqueue_signal(TestSignal())
202+
loop.register_signal_handler(SignalMock, self._handler_callback)
203+
loop.register_signal_handler(SignalMock2, self._handler_force_quit_exception)
204+
loop.enqueue_signal(SignalMock2())
205+
loop.enqueue_signal(SignalMock())
206206
loop.run()
207207

208208
self.assertFalse(self.callback_called)
@@ -211,15 +211,15 @@ def test_force_quit_recursive_loop(self):
211211
self.callback_called = False
212212

213213
loop = self.loop
214-
loop.register_signal_handler(TestSignal,
214+
loop.register_signal_handler(SignalMock,
215215
self._handler_start_inner_loop_and_enqueue_event,
216-
TestSignal3())
217-
loop.register_signal_handler(TestSignal2,
216+
SignalMock3())
217+
loop.register_signal_handler(SignalMock2,
218218
self._handler_callback)
219-
loop.register_signal_handler(TestSignal3,
219+
loop.register_signal_handler(SignalMock3,
220220
self._handler_force_quit_exception)
221-
loop.enqueue_signal(TestSignal())
222-
loop.enqueue_signal(TestSignal2())
221+
loop.enqueue_signal(SignalMock())
222+
loop.enqueue_signal(SignalMock2())
223223
loop.run()
224224

225225
self.assertFalse(self.callback_called)
@@ -228,14 +228,14 @@ def test_force_quit_when_waiting_on_signal(self):
228228
self.callback_called = False
229229

230230
loop = self.loop
231-
loop.register_signal_handler(TestSignal, self._handler_force_quit_exception)
232-
loop.register_signal_handler(TestSignal2, self._handler_callback)
233-
loop.enqueue_signal(TestSignal())
234-
loop.enqueue_signal(TestSignal2())
231+
loop.register_signal_handler(SignalMock, self._handler_force_quit_exception)
232+
loop.register_signal_handler(SignalMock2, self._handler_callback)
233+
loop.enqueue_signal(SignalMock())
234+
loop.enqueue_signal(SignalMock2())
235235

236236
# FIXME: Find a better way how to detect infinite loop
237237
# if force quit won't work properly this will hang up
238-
loop.process_signals(return_after=TestSignal3)
238+
loop.process_signals(return_after=SignalMock3)
239239

240240
self.assertFalse(self.callback_called)
241241

@@ -261,7 +261,7 @@ def _handler_process_events_then_register_testsignal(signal, data):
261261
event_loop = data
262262
event_loop.process_signals()
263263
# This shouldn't be processed
264-
event_loop.enqueue_signal(TestSignal())
264+
event_loop.enqueue_signal(SignalMock())
265265

266266
def _handler_start_inner_loop_and_enqueue_event(self, signal, data):
267267
self.loop.execute_new_loop(data)
@@ -275,35 +275,35 @@ def _handler_force_quit_exception(self, signal, data):
275275

276276

277277
# TESTING EVENTS
278-
class TestSignal(AbstractSignal):
278+
class SignalMock(AbstractSignal):
279279

280280
def __init__(self):
281281
# ignore source
282282
super().__init__(None)
283283

284284

285-
class TestSignal2(AbstractSignal):
285+
class SignalMock2(AbstractSignal):
286286

287287
def __init__(self):
288288
# ignore source
289289
super().__init__(None)
290290

291291

292-
class TestSignal3(AbstractSignal):
292+
class SignalMock3(AbstractSignal):
293293

294294
def __init__(self):
295295
# ignore source
296296
super().__init__(None)
297297

298298

299-
class TestPrioritySignal(AbstractSignal):
299+
class PrioritySignalMock(AbstractSignal):
300300

301301
def __init__(self):
302302
# ignore source
303303
super().__init__(None, -10)
304304

305305

306-
class TestLowPrioritySignal(AbstractSignal):
306+
class LowPrioritySignalMock(AbstractSignal):
307307

308308
def __init__(self):
309309
# ignore source

‎tests/units/main/event_queue_test.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ def test_enqueue(self):
4545
self.assertTrue(self.e.empty())
4646

4747
def test_enqueue_priority(self):
48-
signal_low_priority = TestSignal(priority=10)
49-
signal_high_priority = TestSignal(priority=0)
48+
signal_low_priority = SignalMock(priority=10)
49+
signal_high_priority = SignalMock(priority=0)
5050

5151
self.e.enqueue(signal_low_priority)
5252
self.e.enqueue(signal_high_priority)
@@ -81,15 +81,15 @@ def test_remove_empty_source(self):
8181

8282
def test_enqueue_if_source_belongs(self):
8383
source = MagicMock()
84-
signal = TestSignal(source=source)
84+
signal = SignalMock(source=source)
8585

8686
self.e.add_source(source)
8787
self.assertTrue(self.e.enqueue_if_source_belongs(signal, source))
8888
self.assertEqual(signal, self.e.get())
8989

9090
def test_enqueue_if_source_does_not_belong(self):
91-
signal = TestSignal()
92-
signal_low_priority = TestSignal(priority=25)
91+
signal = SignalMock()
92+
signal_low_priority = SignalMock(priority=25)
9393

9494
# the get method will wait if nothing present so adding low priority signal below
9595
# give us check if the queue is really empty
@@ -99,7 +99,7 @@ def test_enqueue_if_source_does_not_belong(self):
9999
self.assertEqual(signal_low_priority, self.e.get())
100100

101101

102-
class TestSignal(AbstractSignal):
102+
class SignalMock(AbstractSignal):
103103

104104
def __init__(self, source=None, priority=20): # pylint: disable=useless-super-delegation
105105
super().__init__(source, priority)

‎tests/units/main/global_configuration_test.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828

2929
class GlobalConfiguration_TestCase(unittest.TestCase):
3030

31+
def setUp(self):
32+
App.initialize()
33+
3134
def tearDown(self):
3235
App.initialize()
3336

0 commit comments

Comments
 (0)