@@ -244,10 +244,11 @@ def assert_regex(regex: str, string: str) -> None:
244244 assert re .match (regex , string ) is not None , f'`{ string } ` does not match regex { regex } '
245245
246246
247+ @requests_mock .Mocker (case_sensitive = True , kw = 'requests_mocker' )
247248def run_test_case (
248249 pytester : pytest .Pytester ,
249- requests_mock : requests_mock .Mocker ,
250250 manifest : _api .TestSuiteManifest ,
251+ requests_mocker : requests_mock .Mocker ,
251252 expected_test_file_outcomes : List [
252253 Tuple [str , List [Tuple [Tuple [str , ...], List [_TestAttemptOutcome ]]]]],
253254 expected_test_result_counts : _TestResultCounts ,
@@ -266,15 +267,15 @@ def run_test_case(
266267 expect_xdist : bool = False ,
267268) -> None :
268269 api_key_path = pytester .makefile ('' , expected_api_key ) if use_api_key_path else None
269- requests_mock .get (
270+ requests_mocker .get (
270271 url = 'https://app.unflakable.com/api/v1/test-suites/MOCK_SUITE_ID/manifest' ,
271272 request_headers = {'Authorization' : f'Bearer { expected_api_key } ' },
272273 complete_qs = True ,
273274 status_code = 200 ,
274275 json = manifest ,
275276 )
276277
277- requests_mock .post (
278+ requests_mocker .post (
278279 url = 'https://app.unflakable.com/api/v1/test-suites/MOCK_SUITE_ID/runs' ,
279280 request_headers = {
280281 'Authorization' : f'Bearer { expected_api_key } ' ,
@@ -482,7 +483,7 @@ def run_test_case(
482483 expected_test_result_counts .non_skipped_tests > 0 ) else [])
483484 )
484485
485- assert requests_mock .call_count == (
486+ assert requests_mocker .call_count == (
486487 (
487488 2 if expected_uploaded_test_runs is not None and (
488489 expected_test_result_counts .non_skipped_tests > 0 ) else 1
@@ -491,7 +492,7 @@ def run_test_case(
491492
492493 # Checked expected User-Agent. We do this here instead of using an `additional_matcher` to make
493494 # errors easier to diagnose.
494- for request in requests_mock .request_history :
495+ for request in requests_mocker .request_history :
495496 assert_regex (
496497 r'^unflakable-pytest-plugin/.* \(PyTest .*; Python .*; Platform .*\)$' ,
497498 request .headers .get ('User-Agent' , '' )
@@ -500,7 +501,7 @@ def run_test_case(
500501 if plugin_enabled and (
501502 expected_uploaded_test_runs is not None and
502503 expected_test_result_counts .non_skipped_tests > 0 ):
503- create_test_suite_run_request = requests_mock .request_history [1 ]
504+ create_test_suite_run_request = requests_mocker .request_history [1 ]
504505 assert create_test_suite_run_request .url == (
505506 'https://app.unflakable.com/api/v1/test-suites/MOCK_SUITE_ID/runs' )
506507 assert create_test_suite_run_request .method == 'POST'
0 commit comments