@@ -73,14 +73,20 @@ def callback(request: Request):
7373
7474
7575def test_continue_request (driver , pages ):
76+ exceptions = []
77+
7678 def callback (request : Request ):
77- request .continue_request ()
79+ try :
80+ request .continue_request ()
81+ except WebDriverException as e :
82+ exceptions .append (e )
7883
7984 callback_id = driver .network .add_request_handler ("before_request" , callback )
8085 assert callback_id is not None , "Request handler not added"
8186 url = pages .url ("formPage.html" )
8287 driver .browsing_context .navigate (context = driver .current_window_handle , url = url , wait = ReadinessState .COMPLETE )
8388 assert driver .find_element (By .NAME , "login" ).is_displayed (), "Request not continued"
89+ assert len (exceptions ) == 0 , "Exception raised when continuing request in handler callback"
8490
8591
8692def test_continue_with_auth (driver ):
@@ -101,10 +107,9 @@ def test_remove_auth_handler(driver):
101107
102108def test_handler_with_classic_navigation (driver , pages ):
103109 """Verify request handlers also work with classic navigation."""
104- if driver .caps ["browserName" ] == "chrome" :
105- pytest .skip (reason = "Request handlers don't yet work in Chrome when using classic navigation" )
106- if driver .caps ["browserName" ] == "edge" :
107- pytest .skip (reason = "Request handlers don't yet work in Edge when using classic navigation" )
110+ browser_name = driver .caps ["browserName" ]
111+ if browser_name .lower () in ("chrome" , "microsoftedge" ):
112+ pytest .skip (reason = "Request handlers don't yet work in {browser_name} when using classic navigation" )
108113
109114 exceptions = []
110115
@@ -117,7 +122,7 @@ def callback(request: Request):
117122 callback_id = driver .network .add_request_handler ("before_request" , callback )
118123 assert callback_id is not None , "Request handler not added"
119124 pages .load ("formPage.html" )
120- assert len (exceptions ) == 0 , "Exception raised when continuing request in callback"
125+ assert len (exceptions ) == 0 , "Exception raised in handler callback"
121126
122127
123128@pytest .mark .xfail_chrome (reason = "Data URLs in Network requests are not implemented in Chrome yet" )
@@ -141,4 +146,4 @@ def callback(request: Request):
141146 time .sleep (1 ) # give callback time to complete
142147 assert driver .find_element (By .ID , "data-url-image" ).is_displayed ()
143148 assert len (data_requests ) > 0 , "BiDi event not captured"
144- assert len (exceptions ) == 0 , "Exception raised when continuing request in callback"
149+ assert len (exceptions ) == 0 , "Exception raised when continuing request in handler callback"
0 commit comments