diff options
Diffstat (limited to 'bitbake/lib/bb/tests/event.py')
-rw-r--r-- | bitbake/lib/bb/tests/event.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/bitbake/lib/bb/tests/event.py b/bitbake/lib/bb/tests/event.py index 9ca7e9bc8e..4de4cced5e 100644 --- a/bitbake/lib/bb/tests/event.py +++ b/bitbake/lib/bb/tests/event.py | |||
@@ -157,7 +157,7 @@ class EventHandlingTest(unittest.TestCase): | |||
157 | self._test_process.event_handler, | 157 | self._test_process.event_handler, |
158 | event, | 158 | event, |
159 | None) | 159 | None) |
160 | self._test_process.event_handler.assert_called_once_with(event) | 160 | self._test_process.event_handler.assert_called_once_with(event, None) |
161 | 161 | ||
162 | def test_fire_class_handlers(self): | 162 | def test_fire_class_handlers(self): |
163 | """ Test fire_class_handlers method """ | 163 | """ Test fire_class_handlers method """ |
@@ -175,10 +175,10 @@ class EventHandlingTest(unittest.TestCase): | |||
175 | bb.event.fire_class_handlers(event1, None) | 175 | bb.event.fire_class_handlers(event1, None) |
176 | bb.event.fire_class_handlers(event2, None) | 176 | bb.event.fire_class_handlers(event2, None) |
177 | bb.event.fire_class_handlers(event2, None) | 177 | bb.event.fire_class_handlers(event2, None) |
178 | expected_event_handler1 = [call(event1)] | 178 | expected_event_handler1 = [call(event1, None)] |
179 | expected_event_handler2 = [call(event1), | 179 | expected_event_handler2 = [call(event1, None), |
180 | call(event2), | 180 | call(event2, None), |
181 | call(event2)] | 181 | call(event2, None)] |
182 | self.assertEqual(self._test_process.event_handler1.call_args_list, | 182 | self.assertEqual(self._test_process.event_handler1.call_args_list, |
183 | expected_event_handler1) | 183 | expected_event_handler1) |
184 | self.assertEqual(self._test_process.event_handler2.call_args_list, | 184 | self.assertEqual(self._test_process.event_handler2.call_args_list, |
@@ -205,7 +205,7 @@ class EventHandlingTest(unittest.TestCase): | |||
205 | bb.event.fire_class_handlers(event2, None) | 205 | bb.event.fire_class_handlers(event2, None) |
206 | bb.event.fire_class_handlers(event2, None) | 206 | bb.event.fire_class_handlers(event2, None) |
207 | expected_event_handler1 = [] | 207 | expected_event_handler1 = [] |
208 | expected_event_handler2 = [call(event1)] | 208 | expected_event_handler2 = [call(event1, None)] |
209 | self.assertEqual(self._test_process.event_handler1.call_args_list, | 209 | self.assertEqual(self._test_process.event_handler1.call_args_list, |
210 | expected_event_handler1) | 210 | expected_event_handler1) |
211 | self.assertEqual(self._test_process.event_handler2.call_args_list, | 211 | self.assertEqual(self._test_process.event_handler2.call_args_list, |
@@ -223,7 +223,7 @@ class EventHandlingTest(unittest.TestCase): | |||
223 | self.assertEqual(result, bb.event.Registered) | 223 | self.assertEqual(result, bb.event.Registered) |
224 | bb.event.fire_class_handlers(event1, None) | 224 | bb.event.fire_class_handlers(event1, None) |
225 | bb.event.fire_class_handlers(event2, None) | 225 | bb.event.fire_class_handlers(event2, None) |
226 | expected = [call(event1), call(event2)] | 226 | expected = [call(event1, None), call(event2, None)] |
227 | self.assertEqual(self._test_process.event_handler1.call_args_list, | 227 | self.assertEqual(self._test_process.event_handler1.call_args_list, |
228 | expected) | 228 | expected) |
229 | 229 | ||
@@ -237,7 +237,7 @@ class EventHandlingTest(unittest.TestCase): | |||
237 | self.assertEqual(result, bb.event.Registered) | 237 | self.assertEqual(result, bb.event.Registered) |
238 | bb.event.fire_class_handlers(event1, None) | 238 | bb.event.fire_class_handlers(event1, None) |
239 | bb.event.fire_class_handlers(event2, None) | 239 | bb.event.fire_class_handlers(event2, None) |
240 | expected = [call(event1), call(event2), call(event1)] | 240 | expected = [call(event1, None), call(event2, None), call(event1, None)] |
241 | self.assertEqual(self._test_process.event_handler1.call_args_list, | 241 | self.assertEqual(self._test_process.event_handler1.call_args_list, |
242 | expected) | 242 | expected) |
243 | 243 | ||
@@ -251,7 +251,7 @@ class EventHandlingTest(unittest.TestCase): | |||
251 | self.assertEqual(result, bb.event.Registered) | 251 | self.assertEqual(result, bb.event.Registered) |
252 | bb.event.fire_class_handlers(event1, None) | 252 | bb.event.fire_class_handlers(event1, None) |
253 | bb.event.fire_class_handlers(event2, None) | 253 | bb.event.fire_class_handlers(event2, None) |
254 | expected = [call(event1), call(event2), call(event1), call(event2)] | 254 | expected = [call(event1,None), call(event2, None), call(event1, None), call(event2, None)] |
255 | self.assertEqual(self._test_process.event_handler1.call_args_list, | 255 | self.assertEqual(self._test_process.event_handler1.call_args_list, |
256 | expected) | 256 | expected) |
257 | 257 | ||
@@ -359,9 +359,10 @@ class EventHandlingTest(unittest.TestCase): | |||
359 | 359 | ||
360 | event1 = bb.event.ConfigParsed() | 360 | event1 = bb.event.ConfigParsed() |
361 | bb.event.fire(event1, None) | 361 | bb.event.fire(event1, None) |
362 | expected = [call(event1)] | 362 | expected = [call(event1, None)] |
363 | self.assertEqual(self._test_process.event_handler1.call_args_list, | 363 | self.assertEqual(self._test_process.event_handler1.call_args_list, |
364 | expected) | 364 | expected) |
365 | expected = [call(event1)] | ||
365 | self.assertEqual(self._test_ui1.event.send.call_args_list, | 366 | self.assertEqual(self._test_ui1.event.send.call_args_list, |
366 | expected) | 367 | expected) |
367 | 368 | ||