Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b35cd2f

Browse files
committedJun 21, 2024··
Run twisted test on Windows too
1 parent 1e509df commit b35cd2f

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed
 

‎tests/tests_twisted/test_mixed_requests.py

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import platform
2-
import pytest
31
from scrapy import Spider
42
from scrapy.http import Request, Response
53
from scrapy.utils.test import get_crawler
@@ -10,7 +8,6 @@
108
from tests.mockserver import StaticMockServer
119

1210

13-
@pytest.mark.skipif(platform.system() == "Windows", reason="Gets stuck on Windows")
1411
class MixedRequestsTestCase(TestCase):
1512
"""
1613
This test case ensures the handler's 'download_request' method works as expected, and
@@ -30,24 +27,28 @@ def tearDown(self):
3027
self.server.__exit__(None, None, None)
3128
yield self.handler.close()
3229

33-
def test_regular_request(self):
34-
def _test(response):
30+
@defer.inlineCallbacks
31+
def test_download_request(self):
32+
def _test_regular(response, request):
3533
self.assertIsInstance(response, Response)
3634
self.assertEqual(response.css("a::text").getall(), ["Lorem Ipsum", "Infinite Scroll"])
3735
self.assertEqual(response.url, request.url)
3836
self.assertEqual(response.status, 200)
3937
self.assertNotIn("playwright", response.flags)
4038

41-
request = Request(self.server.urljoin("/index.html"))
42-
return self.handler.download_request(request, Spider("foo")).addCallback(_test)
43-
44-
def test_playwright_request(self):
45-
def _test(response):
39+
def _test_playwright(response, request):
4640
self.assertIsInstance(response, Response)
4741
self.assertEqual(response.css("a::text").getall(), ["Lorem Ipsum", "Infinite Scroll"])
4842
self.assertEqual(response.url, request.url)
4943
self.assertEqual(response.status, 200)
5044
self.assertIn("playwright", response.flags)
5145

52-
request = Request(self.server.urljoin("/index.html"), meta={"playwright": True})
53-
return self.handler.download_request(request, Spider("foo")).addCallback(_test)
46+
req1 = Request(self.server.urljoin("/index.html"))
47+
yield self.handler.download_request(req1, Spider("foo")).addCallback(
48+
_test_regular, request=req1
49+
)
50+
51+
req2 = Request(self.server.urljoin("/index.html"), meta={"playwright": True})
52+
yield self.handler.download_request(req2, Spider("foo")).addCallback(
53+
_test_playwright, request=req2
54+
)

0 commit comments

Comments
 (0)
Please sign in to comment.