Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge remote-tracking branch 'upstream/remove-py2-tests' into remove-six-code
Eugenio Lacuesta6f6426559dfa
diff --cc tests/test_proxy_connect.pyindex 4147dc944,277455751..7a7ec4281--- a/tests/test_proxy_connect.py+++ b/tests/test_proxy_connect.py@@@ -82,20 -76,10 +75,10 @@@ class ProxyConnectTestCase(TestCase)@defer.inlineCallbacksdef test_https_connect_tunnel(self):crawler = get_crawler(SimpleSpider)- with LogCapture() as l:+ with LogCapture() as logs:yield crawler.crawl(self.mockserver.url("/status?n=200", is_secure=True))- self._assert_got_response_code(200, l)+ self._assert_got_response_code(200, logs)- @pytest.mark.xfail(reason='mitmproxy gives an error for noconnect requests')- @defer.inlineCallbacks- def test_https_noconnect(self):- proxy = os.environ['https_proxy']- os.environ['https_proxy'] = proxy + '?noconnect'- crawler = get_crawler(SimpleSpider)- with LogCapture() as logs:- yield crawler.crawl(self.mockserver.url("/status?n=200", is_secure=True))- self._assert_got_response_code(200, logs)-@pytest.mark.xfail(reason='Python 3.6+ fails this earlier', condition=sys.version_info.minor >= 6)@defer.inlineCallbacksdef test_https_connect_tunnel_error(self):