Commit 2edeb01c by Sebastian Rahlf Committed by Gabriel

Latest pytest-localserver version supports Python 3.3+

parent ce949799
...@@ -23,7 +23,7 @@ def test_parsing(): ...@@ -23,7 +23,7 @@ def test_parsing():
assert cd.filename_unsafe == u'€ rates' assert cd.filename_unsafe == u'€ rates'
@pytest.mark.skipif("sys.version_info >= (3,0)") @pytest.mark.skipif("(3,0) <= sys.version_info < (3,3)")
def test_httplib2(httpserver): def test_httplib2(httpserver):
httplib2 = pytest.importorskip('httplib2') httplib2 = pytest.importorskip('httplib2')
http = httplib2.Http() http = httplib2.Http()
...@@ -33,7 +33,7 @@ def test_httplib2(httpserver): ...@@ -33,7 +33,7 @@ def test_httplib2(httpserver):
assert parse_httplib2_response(resp).filename_unsafe == 'a b=' assert parse_httplib2_response(resp).filename_unsafe == 'a b='
@pytest.mark.skipif("sys.version_info >= (3,0)") @pytest.mark.skipif("(3,0) <= sys.version_info < (3,3)")
def test_requests(httpserver): def test_requests(httpserver):
requests = pytest.importorskip('requests') requests = pytest.importorskip('requests')
httpserver.serve_content('eep', headers={ httpserver.serve_content('eep', headers={
......
...@@ -4,22 +4,13 @@ envlist=py27,py26,py32,py33,pypy ...@@ -4,22 +4,13 @@ envlist=py27,py26,py32,py33,pypy
[testenv] [testenv]
deps= deps=
pytest pytest
pytest-localserver pytest-localserver>=0.3
httplib2 httplib2
requests requests
commands=py.test --pyargs test_rfc6266 commands=py.test --pyargs test_rfc6266
[testenv:py32]
# pytest-localserver isn't py3k-compatible;
# httplib2 and requests can't be tested
deps=
pytest
# Changedir is a hack to prevent test discovery from finding the non-2to3 # Changedir is a hack to prevent test discovery from finding the non-2to3
# source. We want tests to be import-based only. # source. We want tests to be import-based only.
changedir=.tox changedir=.tox
[testenv:py33]
deps=pytest
changedir=.tox
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment