From d7024dcd33736e20fb547f0b0611e4c1d174ee99 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 8 Oct 2009 16:31:37 +0100 Subject: [PATCH] urllib does not support no_proxy in python < 2.6. Skip it tests. --- scrapy/tests/test_downloadermiddleware_httpproxy.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scrapy/tests/test_downloadermiddleware_httpproxy.py b/scrapy/tests/test_downloadermiddleware_httpproxy.py index c2fb46364..dd9602661 100644 --- a/scrapy/tests/test_downloadermiddleware_httpproxy.py +++ b/scrapy/tests/test_downloadermiddleware_httpproxy.py @@ -1,5 +1,6 @@ import os -from unittest import TestCase +import sys +from twisted.trial.unittest import TestCase, SkipTest from scrapy.contrib.downloadermiddleware.httpproxy import HttpProxyMiddleware from scrapy.core.exceptions import NotConfigured @@ -11,6 +12,8 @@ spider = BaseSpider() class TestDefaultHeadersMiddleware(TestCase): + failureException = AssertionError + def setUp(self): self._oldenv = os.environ.copy() @@ -61,6 +64,8 @@ class TestDefaultHeadersMiddleware(TestCase): def test_no_proxy(self): + if sys.version_info < (2, 6): + raise SkipTest('no_proxy is not supported in python < 2.6') os.environ['http_proxy'] = http_proxy = 'https://proxy.for.http:3128' mw = HttpProxyMiddleware()