summaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
authorJordan Cook <jordan.cook.git@proton.me>2023-05-08 11:23:22 -0500
committerJordan Cook <jordan.cook.git@proton.me>2023-05-08 11:32:25 -0500
commit7a0aa6de6bb9d912554bac6cafef2d2ff7c757b6 (patch)
tree70b96898114b73698dc3cdc4639f215acd07fce1 /tests/integration
parent83f7bc77e4daeab70e19e29a1ed1ba4bcabff9e1 (diff)
downloadrequests-cache-7a0aa6de6bb9d912554bac6cafef2d2ff7c757b6.tar.gz
Enable bugbear extension and fix warnings
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/base_cache_test.py16
-rw-r--r--tests/integration/base_storage_test.py2
-rw-r--r--tests/integration/test_sqlite.py8
-rw-r--r--tests/integration/test_upgrade.py2
4 files changed, 11 insertions, 17 deletions
diff --git a/tests/integration/base_cache_test.py b/tests/integration/base_cache_test.py
index d37bfa7..7801570 100644
--- a/tests/integration/base_cache_test.py
+++ b/tests/integration/base_cache_test.py
@@ -252,15 +252,9 @@ class BaseCacheTest:
assert response.from_cache is True
assert response.is_expired is False
- # Make sure an immediate subsequent request will be served from the cache for another max-age==60 secondss
- try:
- with patch.object(Session, 'send', side_effect=AssertionError):
- response = session.get(url, params=first_response_headers)
- except AssertionError:
- assert False, (
- "Session tried to perform re-validation although cached response should have been "
- "refreshened."
- )
+ # Make sure an immediate subsequent request will be served from the cache for another 60 seconds
+ with patch.object(Session, 'send', side_effect=AssertionError):
+ response = session.get(url, params=first_response_headers)
assert response.from_cache is True
assert response.is_expired is False
@@ -283,7 +277,7 @@ class BaseCacheTest:
def test_multipart_upload(self):
session = self.init_session()
session.post(httpbin('post'), files={'file1': BytesIO(b'10' * 1024)})
- for i in range(5):
+ for _ in range(5):
assert session.post(httpbin('post'), files={'file1': BytesIO(b'10' * 1024)}).from_cache
def test_delete__expired(self):
@@ -304,7 +298,7 @@ class BaseCacheTest:
assert len(session.cache.responses.keys()) == 2
assert len(session.cache.redirects.keys()) == 3
assert not session.cache.contains(url=httpbin('redirect/1'))
- assert not any([session.cache.contains(url=httpbin(f)) for f in HTTPBIN_FORMATS])
+ assert not any(session.cache.contains(url=httpbin(f)) for f in HTTPBIN_FORMATS)
@pytest.mark.parametrize('method', HTTPBIN_METHODS)
def test_filter_request_headers(self, method):
diff --git a/tests/integration/base_storage_test.py b/tests/integration/base_storage_test.py
index 4870c02..a7ff436 100644
--- a/tests/integration/base_storage_test.py
+++ b/tests/integration/base_storage_test.py
@@ -40,7 +40,7 @@ class BaseStorageTest:
for i in range(self.num_instances):
cache = caches[i]
- cache[f'key_{i}'] == f'value_{i}'
+ assert cache[f'key_{i}'] == f'value_{i}'
assert len(cache) == 2
assert f'key_{i}' in cache and f'key_{i+1}' in cache
diff --git a/tests/integration/test_sqlite.py b/tests/integration/test_sqlite.py
index 04e4b61..173cc60 100644
--- a/tests/integration/test_sqlite.py
+++ b/tests/integration/test_sqlite.py
@@ -163,7 +163,7 @@ class TestSQLiteDict(BaseStorageTest):
assert len(items) == limit or 100
prev_item = None
- for i, item in enumerate(items):
+ for item in items:
assert prev_item is None or len(prev_item) > len(item)
@skip_pypy
@@ -201,7 +201,7 @@ class TestSQLiteDict(BaseStorageTest):
assert len(items) == limit or 100
prev_item = None
- for i, item in enumerate(items):
+ for item in items:
assert prev_item is None or prev_item.expires < item.expires
@skip_pypy
@@ -223,7 +223,7 @@ class TestSQLiteDict(BaseStorageTest):
assert len(items) == 50
prev_item = None
- for i, item in enumerate(items):
+ for item in items:
assert prev_item is None or prev_item.expires < item.expires
assert item.status_code % 2 == 0
@@ -345,7 +345,7 @@ class TestSQLiteCache(BaseCacheTest):
assert len(items) == 100
prev_item = None
- for i, item in enumerate(items):
+ for item in items:
assert prev_item is None or prev_item.expires < item.expires
assert item.cache_key
assert not item.is_expired
diff --git a/tests/integration/test_upgrade.py b/tests/integration/test_upgrade.py
index 162024e..6774ec4 100644
--- a/tests/integration/test_upgrade.py
+++ b/tests/integration/test_upgrade.py
@@ -19,5 +19,5 @@ def test_version_upgrade(db_path, tempfile_path):
session = CachedSession(tempfile_path)
for response_format in HTTPBIN_FORMATS:
- session.get(httpbin(response_format)).from_cache
+ session.get(httpbin(response_format))
assert session.get(httpbin(response_format)).from_cache is True