From e247a933b05b437b6e46af718c311fe0478c7d1c Mon Sep 17 00:00:00 2001 From: "James E. King III" Date: Sat, 22 Dec 2018 20:35:25 +0000 Subject: [PATCH] fix incompatibility with vcrpy 2 --- .travis.yml | 13 +++++++------ test-requirements.txt | 2 +- tests/fixtures/ssl_tunnel.yaml | 2 +- tests/fixtures/ssl_tunnel_http_failure.yaml | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29fe1792..dd185387 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,15 @@ language: python python: - - "2.7" - - "pypy" - - "3.6" + - 2.7 + - 3.6 + - 3.7 + - pypy before_install: - - pip install -r requirements.txt - - pip install -r test-requirements.txt + - pip install -r requirements.txt + - pip install -r test-requirements.txt install: - - python setup.py install + - python setup.py install script: python setup.py test diff --git a/test-requirements.txt b/test-requirements.txt index 96679998..6803fce1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,3 @@ tox testtools>=0.9.34 -vcrpy<2 +vcrpy diff --git a/tests/fixtures/ssl_tunnel.yaml b/tests/fixtures/ssl_tunnel.yaml index 203e0d5e..11dc9fa6 100644 --- a/tests/fixtures/ssl_tunnel.yaml +++ b/tests/fixtures/ssl_tunnel.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: {} method: CONNECT - uri: http://vcsasdkTunnel:8089 + uri: sdkTunnel:8089 response: body: {string: !!python/unicode ''} headers: diff --git a/tests/fixtures/ssl_tunnel_http_failure.yaml b/tests/fixtures/ssl_tunnel_http_failure.yaml index 46be909b..22ac65bd 100644 --- a/tests/fixtures/ssl_tunnel_http_failure.yaml +++ b/tests/fixtures/ssl_tunnel_http_failure.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: {} method: CONNECT - uri: http://vcsavcsa:80 + uri: vcsa:80 response: body: {string: !!python/unicode '

404 Not Found

'} headers: