holm/httpie-cli
1
1
Fork 0
forked from extern/httpie-cli
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #312 from msabramo/patch-5

Browse Source 
tox.ini: Use pytest-httpbin>=0.0.6
This commit is contained in:
Jakub Roztočil 2015-02-16 20:27:35 +01:00
commit 9e62151bec
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_ssl.py
View File

@ -5,7 +5,6 @@ import pytest_httpbin.certs
from requests.exceptions import SSLError from requests.exceptions import SSLError
from httpie import ExitStatus from httpie import ExitStatus
from httpie.compat import is_pypy
from utils import http, HTTP_OK, TESTS_ROOT from utils import http, HTTP_OK, TESTS_ROOT
@ -19,9 +18,6 @@ CLIENT_PEM = os.path.join(TESTS_ROOT, 'client_certs', 'client.pem')
CA_BUNDLE = pytest_httpbin.certs.where() CA_BUNDLE = pytest_httpbin.certs.where()
@pytest.mark.skipif(
is_pypy,
reason='https://github.com/jakubroztocil/httpie/issues/308')
class TestClientSSLCertHandling(object): class TestClientSSLCertHandling(object):
def test_cert_file_not_found(self, httpbin_secure): def test_cert_file_not_found(self, httpbin_secure):
@ -58,9 +54,6 @@ class TestClientSSLCertHandling(object):
assert HTTP_OK in r assert HTTP_OK in r
@pytest.mark.skipif(
is_pypy,
reason='https://github.com/jakubroztocil/httpie/issues/308')
class TestServerSSLCertHandling(object): class TestServerSSLCertHandling(object):
def test_self_signed_server_cert_by_default_raises_ssl_error( def test_self_signed_server_cert_by_default_raises_ssl_error(

2
tox.ini
View File

@ -12,7 +12,7 @@ envlist = py26, py27, py34, pypy
[testenv] [testenv]
deps = deps =
pytest pytest
pytest-httpbin pytest-httpbin>=0.0.6
commands = commands =
py.test --verbose --doctest-modules --basetemp={envtmpdir} {posargs:./tests ./httpie} py.test --verbose --doctest-modules --basetemp={envtmpdir} {posargs:./tests ./httpie}