Scrapy, a fast high-level web crawling & scraping framework for Python.
Added failing test cases to tests/test_contracts.py and fixed corresponding methods + removed pylint comments
Nicholas Laustrupbfcee452b0f9
diff --git a/scrapy/contracts/__init__.py b/scrapy/contracts/__init__.pyindex 9071395e3..3b4f932a0 100644--- a/scrapy/contracts/__init__.py+++ b/scrapy/contracts/__init__.py@@ -38,9 +38,7 @@ class Contract:assert cb is not None@wraps(cb)- def wrapper( # pylint: disable=inconsistent-return-statements- response: Response, **cb_kwargs: Any- ) -> list[Any]:+ def wrapper(response: Response, **cb_kwargs: Any) -> list[Any]:try:results.startTest(self.testcase_pre)self.pre_process(response)@@ -51,13 +49,10 @@ class Contract:results.addError(self.testcase_pre, sys.exc_info())else:results.addSuccess(self.testcase_pre)- finally:- cb_result = cb(response, **cb_kwargs)- if isinstance(cb_result, (AsyncGenerator, CoroutineType)):- raise TypeError("Contracts don't support async callbacks")- return list( # pylint: disable=return-in-finally- cast(Iterable[Any], iterate_spider_output(cb_result))- )+ cb_result = cb(response, **cb_kwargs)+ if isinstance(cb_result, (AsyncGenerator, CoroutineType)):+ raise TypeError("Contracts don't support async callbacks")+ return list(cast(Iterable[Any], iterate_spider_output(cb_result)))request.callback = wrapper@@ -69,9 +64,7 @@ class Contract:assert cb is not None@wraps(cb)- def wrapper( # pylint: disable=inconsistent-return-statements- response: Response, **cb_kwargs: Any- ) -> list[Any]:+ def wrapper(response: Response, **cb_kwargs: Any) -> list[Any]:cb_result = cb(response, **cb_kwargs)if isinstance(cb_result, (AsyncGenerator, CoroutineType)):raise TypeError("Contracts don't support async callbacks")@@ -86,8 +79,7 @@ class Contract:results.addError(self.testcase_post, sys.exc_info())else:results.addSuccess(self.testcase_post)- finally:- return output # pylint: disable=return-in-finally+ return outputrequest.callback = wrapperdiff --git a/tests/test_contracts.py b/tests/test_contracts.pyindex d578b3af4..b0cb92d12 100644--- a/tests/test_contracts.py+++ b/tests/test_contracts.py@@ -556,3 +556,61 @@ class ContractsManagerTest(unittest.TestCase):requests = self.conman.from_spider(spider, self.results)self.assertTrue(requests)+++class CustomFailContractPreProcess(Contract):+ name = "test_contract"++ def pre_process(self, response):+ raise KeyboardInterrupt("Pre-process exception")+++class CustomFailContractPostProcess(Contract):+ name = "test_contract"++ def post_process(self, response):+ raise KeyboardInterrupt("Post-process exception")+++class CustomContractPrePostProcess(unittest.TestCase):++ def setUp(self):+ self.results = TextTestResult(stream=None, descriptions=False, verbosity=0)++ def test_pre_hook_keyboard_interrupt(self):+ spider = TestSpider()+ response = ResponseMock()+ contract = CustomFailContractPreProcess(spider.returns_request)+ conman = ContractsManager([contract])++ try:+ request = conman.from_method(spider.returns_request, self.results)+ contract.add_pre_hook(request, self.results)+ # Expect this to raise a KeyboardInterrupt+ request.callback(response, **request.cb_kwargs)+ except KeyboardInterrupt as e:+ self.assertEqual(str(e), "Pre-process exception")+ else:+ self.fail("KeyboardInterrupt not raised")++ self.assertFalse(self.results.failures)+ self.assertFalse(self.results.errors)++ def test_post_hook_keyboard_interrupt(self):+ spider = TestSpider()+ response = ResponseMock()+ contract = CustomFailContractPostProcess(spider.returns_request)+ conman = ContractsManager([contract])++ try:+ request = conman.from_method(spider.returns_request, self.results)+ contract.add_post_hook(request, self.results)+ # Expect this to raise a KeyboardInterrupt+ request.callback(response, **request.cb_kwargs)+ except KeyboardInterrupt as e:+ self.assertEqual(str(e), "Post-process exception")+ else:+ self.fail("KeyboardInterrupt not raised")++ self.assertFalse(self.results.failures)+ self.assertFalse(self.results.errors)