2828from .fixtures import ArbitraryOperation
2929from tests .unit .common .pipeline import pipeline_stage_test
3030
31-
3231this_module = sys .modules [__name__ ]
3332logging .basicConfig (level = logging .DEBUG )
3433pytestmark = pytest .mark .usefixtures ("fake_pipeline_thread" )
@@ -184,11 +183,11 @@ def event(self):
184183 return pipeline_events_base .ConnectedEvent ()
185184
186185 @pytest .mark .it ("Invokes the 'on_connected_handler' handler function, if set" )
187- def test_invoke_handler (self , mocker , stage , event ):
186+ def test_invoke_handler (self , mocker , stage , event , wait_for ):
188187 mock_handler = mocker .MagicMock ()
189188 stage .on_connected_handler = mock_handler
190189 stage .handle_pipeline_event (event )
191- time . sleep ( 0.1 ) # Needs a brief sleep so thread can switch
190+ wait_for ( lambda : mock_handler . call_count >= 1 )
192191 assert mock_handler .call_count == 1
193192 assert mock_handler .call_args == mocker .call ()
194193
@@ -204,11 +203,11 @@ def event(self):
204203 return pipeline_events_base .DisconnectedEvent ()
205204
206205 @pytest .mark .it ("Invokes the 'on_disconnected_handler' handler function, if set" )
207- def test_invoke_handler (self , mocker , stage , event ):
206+ def test_invoke_handler (self , mocker , stage , event , wait_for ):
208207 mock_handler = mocker .MagicMock ()
209208 stage .on_disconnected_handler = mock_handler
210209 stage .handle_pipeline_event (event )
211- time . sleep ( 0.1 ) # Needs a brief sleep so thread can switch
210+ wait_for ( lambda : mock_handler . call_count >= 1 )
212211 assert mock_handler .call_count == 1
213212 assert mock_handler .call_args == mocker .call ()
214213
@@ -224,11 +223,11 @@ def event(self):
224223 return pipeline_events_base .NewSasTokenRequiredEvent ()
225224
226225 @pytest .mark .it ("Invokes the 'on_new_sastoken_required_handler' handler function, if set" )
227- def test_invoke_handler (self , mocker , stage , event ):
226+ def test_invoke_handler (self , mocker , stage , event , wait_for ):
228227 mock_handler = mocker .MagicMock ()
229228 stage .on_new_sastoken_required_handler = mock_handler
230229 stage .handle_pipeline_event (event )
231- time . sleep ( 0.1 ) # Needs a brief sleep so thread can switch
230+ wait_for ( lambda : mock_handler . call_count >= 1 )
232231 assert mock_handler .call_count == 1
233232 assert mock_handler .call_args == mocker .call ()
234233
@@ -246,11 +245,11 @@ def event(self, arbitrary_exception):
246245 @pytest .mark .it (
247246 "Invokes the 'on_background_exception_handler' handler function, passing the exception object, if set"
248247 )
249- def test_invoke_handler (self , mocker , stage , event ):
248+ def test_invoke_handler (self , mocker , stage , event , wait_for ):
250249 mock_handler = mocker .MagicMock ()
251250 stage .on_background_exception_handler = mock_handler
252251 stage .handle_pipeline_event (event )
253- time . sleep ( 0.1 ) # Needs a brief sleep so thread can switch
252+ wait_for ( lambda : mock_handler . call_count >= 1 )
254253 assert mock_handler .call_count == 1
255254 assert mock_handler .call_args == mocker .call (event .e )
256255
@@ -266,11 +265,11 @@ def event(self, arbitrary_event):
266265 return arbitrary_event
267266
268267 @pytest .mark .it ("Invokes the 'on_pipeline_event_handler' handler function, if set" )
269- def test_invoke_handler (self , mocker , stage , event ):
268+ def test_invoke_handler (self , mocker , stage , event , wait_for ):
270269 mock_handler = mocker .MagicMock ()
271270 stage .on_pipeline_event_handler = mock_handler
272271 stage .handle_pipeline_event (event )
273- time . sleep ( 0.1 ) # Needs a brief sleep so thread can switch
272+ wait_for ( lambda : mock_handler . call_count >= 1 )
274273 assert mock_handler .call_count == 1
275274 assert mock_handler .call_args == mocker .call (event )
276275
0 commit comments