1
0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-09 17:15:35 +00:00

Fix linter

This commit is contained in:
Martynas Mickevičius
2020-05-05 18:09:16 +03:00
committed by Kevin McCarthy
parent 133423ce94
commit 0ef400195b
3 changed files with 9 additions and 12 deletions

View File

@@ -1,4 +1,3 @@
from unittest.mock import MagicMock
import pytest import pytest
import contextlib import contextlib
import os import os
@@ -194,6 +193,7 @@ def test_behind_proxy(do_request):
def test_cookies(tmpdir, scheme, do_request): def test_cookies(tmpdir, scheme, do_request):
def client_cookies(client): def client_cookies(client):
return [c for c in client._client.cookies] return [c for c in client._client.cookies]
def response_cookies(response): def response_cookies(response):
return [c for c in response.cookies] return [c for c in response.cookies]
@@ -204,25 +204,24 @@ def test_cookies(tmpdir, scheme, do_request):
testfile = str(tmpdir.join("cookies.yml")) testfile = str(tmpdir.join("cookies.yml"))
with vcr.use_cassette(testfile): with vcr.use_cassette(testfile):
r1 = client("GET", url + "/cookies/set?k1=v1&k2=v2") r1 = client("GET", url + "/cookies/set?k1=v1&k2=v2")
assert response_cookies(r1.history[0]) == ['k1', 'k2'] assert response_cookies(r1.history[0]) == ["k1", "k2"]
assert response_cookies(r1) == [] assert response_cookies(r1) == []
r2 = client("GET", url + "/cookies") r2 = client("GET", url + "/cookies")
assert len(r2.json()["cookies"]) == 2 assert len(r2.json()["cookies"]) == 2
assert client_cookies(client) == ['k1', 'k2'] assert client_cookies(client) == ["k1", "k2"]
new_client = do_request() new_client = do_request()
assert client_cookies(new_client) == [] assert client_cookies(new_client) == []
with vcr.use_cassette(testfile) as cassette: with vcr.use_cassette(testfile) as cassette:
cassette_response = new_client("GET", url + "/cookies/set?k1=v1&k2=v2") cassette_response = new_client("GET", url + "/cookies/set?k1=v1&k2=v2")
assert response_cookies(cassette_response.history[0]) == ['k1', 'k2'] assert response_cookies(cassette_response.history[0]) == ["k1", "k2"]
assert response_cookies(cassette_response) == [] assert response_cookies(cassette_response) == []
assert cassette.play_count == 2 assert cassette.play_count == 2
assert client_cookies(new_client) == ['k1', 'k2'] assert client_cookies(new_client) == ["k1", "k2"]
def test_relative_redirects(tmpdir, scheme, do_request): def test_relative_redirects(tmpdir, scheme, do_request):
@@ -239,4 +238,3 @@ def test_relative_redirects(tmpdir, scheme, do_request):
assert response.json()["url"].endswith("get") assert response.json()["url"].endswith("get")
assert cassette.play_count == 3 assert cassette.play_count == 3

View File

@@ -1,6 +1,6 @@
[tox] [tox]
skip_missing_interpreters=true skip_missing_interpreters=true
envlist = envlist =
cov-clean, cov-clean,
lint, lint,
{py35,py36,py37,py38}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp,httpx}, {py35,py36,py37,py38}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp,httpx},
@@ -18,7 +18,7 @@ commands = coverage erase
[testenv:cov-report] [testenv:cov-report]
deps = coverage deps = coverage
skip_install=true skip_install=true
commands = commands =
coverage html coverage html
coverage report --fail-under=90 coverage report --fail-under=90
@@ -30,8 +30,8 @@ commands =
flake8 --version flake8 --version
flake8 --exclude=./docs/conf.py,./.tox/ flake8 --exclude=./docs/conf.py,./.tox/
pyflakes ./docs/conf.py pyflakes ./docs/conf.py
deps = deps =
flake8 flake8
black black
[testenv:docs] [testenv:docs]

View File

@@ -2,7 +2,6 @@ import functools
import logging import logging
from unittest.mock import patch, MagicMock from unittest.mock import patch, MagicMock
from yarl import URL
import httpx import httpx
from vcr.request import Request as VcrRequest from vcr.request import Request as VcrRequest
from vcr.errors import CannotOverwriteExistingCassetteException from vcr.errors import CannotOverwriteExistingCassetteException