diff --git a/.travis.yml b/.travis.yml index 4d90b3f..8e25359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: - "3.7" - "nightly" - "pypy3.6-7.1.1" -install: pip install -U $DEPS pytest pytest-asyncio flaky structlog +install: pip install -U $DEPS pytest pytest-asyncio pytest-httpbin flaky structlog script: pytest env: global: diff --git a/setup.py b/setup.py index 8853f61..8446e8f 100755 --- a/setup.py +++ b/setup.py @@ -28,6 +28,7 @@ setup( tests_require = [ 'pytest', 'pytest-asyncio', + 'pytest-httpbin', 'flaky', ], entry_points = { diff --git a/tests/test_regex.py b/tests/test_regex.py index 0c1ac72..ee57c8a 100644 --- a/tests/test_regex.py +++ b/tests/test_regex.py @@ -4,12 +4,16 @@ import pytest pytestmark = pytest.mark.asyncio -@pytest.mark.skipif(True, - reason='httpbin is overloaded?') -async def test_regex_httpbin(get_version): +async def test_regex_httpbin_default_user_agent(get_version, httpbin): assert await get_version("example", { - "url": "https://httpbin.org/get", - "regex": r'"User-Agent": "(\w+)"', + "url": httpbin.url + "/get", + "regex": r'"User-Agent":\s*"([^"]+)"', + }) == "lilydjwg/nvchecker" + +async def test_regex_httpbin(get_version, httpbin): + assert await get_version("example", { + "url": httpbin.url + "/get", + "regex": r'"User-Agent":\s*"([^"]+)"', "user_agent": "Meow", }) == "Meow"