sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tests again

Browse source 
Reverts f087ec599e
This commit is contained in:
Markus Unterwaditzer 2015-07-08 23:52:49 +02:00
parent fc5175f7f3
commit b58935c90d
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/utils/test_main.py
View file

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os import os
import platform
import stat import stat
import click import click
@ -228,7 +229,18 @@ def test_request_ssl(httpsserver):
with pytest.raises(requests.exceptions.SSLError) as excinfo: with pytest.raises(requests.exceptions.SSLError) as excinfo:
utils.http.request('GET', httpsserver.url) utils.http.request('GET', httpsserver.url)
assert 'certificate verify failed' in str(excinfo.value) assert 'certificate verify failed' in str(excinfo.value)
utils.http.request('GET', httpsserver.url, verify=False) utils.http.request('GET', httpsserver.url, verify=False)
# https://github.com/shazow/urllib3/issues/529
from pkg_resources import parse_version as ver
tolerant_python = (
utils.compat.PY2 and platform.python_implementation() != 'PyPy'
)
broken_urllib3 = ver(requests.__version__) <= ver('2.5.1')
if broken_urllib3 and not tolerant_python:
return
utils.http.request('GET', httpsserver.url, utils.http.request('GET', httpsserver.url,
verify_fingerprint=sha1) verify_fingerprint=sha1)
utils.http.request('GET', httpsserver.url, verify_fingerprint=md5) utils.http.request('GET', httpsserver.url, verify_fingerprint=md5)