Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

deal with travis installing ssl backport by default

  • Loading branch information...
commit 1ff602013046473de1e22720e9e70db1191a11b8 1 parent 60b0401
@qwcode authored
Showing with 6 additions and 3 deletions.
  1. +1 −1  tests/test_pip.py
  2. +2 −2 tests/test_proxy.py
  3. +3 −0  tests/test_ssl.py
View
2  tests/test_pip.py
@@ -136,7 +136,7 @@ def reset_env(environ=None,
#hence, this workaround
(env.lib_path/'no-global-site-packages.txt').rm()
- if sys.version_info[:2] == (2, 5) and (not ssl) and insecure:
+ if sys.version_info[:2] == (2, 5) and insecure:
#allow py25 tests to work
env.environ['PIP_INSECURE'] = '1'
View
4 tests/test_proxy.py
@@ -13,7 +13,7 @@
import pip
import getpass
from pip.basecommand import get_proxy
-from pip.backwardcompat import urllib2
+from pip.backwardcompat import urllib2, ssl
from pip.download import urlopen, VerifiedHTTPSHandler
from tests.test_pip import here
@@ -79,7 +79,7 @@ def test_proxy_handlers_present():
handler_types = [h.__class__ for h in o.handlers]
- if sys.version_info < (2, 6):
+ if not ssl:
assert handler_types == [
urllib2.ProxyHandler, # this is needed
urllib2.UnknownHandler,
View
3  tests/test_ssl.py
@@ -29,6 +29,9 @@ def test_https_fails(self):
"""
Test py25 access https fails
"""
+ if ssl:
+ #travis installs the backport in py25
+ raise SkipTest()
os.environ['PIP_INSECURE'] = ''
assert_raises_regexp(PipError, 'ssl certified', urlopen.get_opener, scheme='https')
Please sign in to comment.
Something went wrong with that request. Please try again.