Skip to content

Deduplicate and simplify Expires header test code. #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adk-swisstopo merged 1 commit into from
Jun 2, 2026
+18 −22
Merged

Deduplicate and simplify Expires header test code. #643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions app/tests/tests_10/test_generic_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,14 @@ def test_delete_precondition(self):

class ApiCacheHeaderTestCase(S3TestMixin, MockS3PerTestMixin, StacBaseTestCase):

def assert_expires(
self, response, before, how_soon=timedelta(seconds=0), tolerance=timedelta(seconds=1)
):
self.assertIn('Expires', response.headers)
expires = datetime.strptime(response['Expires'], '%a, %d %b %Y %H:%M:%S GMT')
expected = before + how_soon
self.assertAlmostEqual(expected, expires, delta=tolerance)

def setUp(self):
super().setUp()
self.factory = Factory()
Expand Down Expand Up @@ -455,10 +463,7 @@ def test_get_cache_header_collections_and_search_default(self):
'max-age=0, no-cache, no-store, must-revalidate, private',
msg='Wrong cache-control values'
)

self.assertTrue(response.has_header('Expires'), msg="Expires header missing")
expires = datetime.strptime(response['Expires'], '%a, %d %b %Y %H:%M:%S GMT')
self.assertAlmostEqual((expires - now).total_seconds(), 0, delta=1)
self.assert_expires(response, now)

@override_settings(COLLECTIONS_AGGREGATE_CACHE_SECONDS=10)
def test_get_cache_header_collections_and_search(self):
Expand All @@ -477,10 +482,9 @@ def test_get_cache_header_collections_and_search(self):
'max-age=10, public',
msg='Wrong cache-control values'
)

self.assertTrue(response.has_header('Expires'), msg="Expires header missing")
expires = datetime.strptime(response['Expires'], '%a, %d %b %Y %H:%M:%S GMT')
self.assertAlmostEqual((expires - now).total_seconds(), 10, delta=1)
self.assert_expires(
response, now, how_soon=timedelta(seconds=10), tolerance=timedelta(seconds=1)
)

@override_settings(CACHE_MIDDLEWARE_SECONDS=3600)
def test_get_cache_header(self):
Expand All @@ -505,13 +509,9 @@ def test_get_cache_header(self):
'max-age=3600, public',
msg='Wrong cache-control values'
)

self.assertTrue(response.has_header('Expires'), msg="Expires header missing")

expires = datetime.strptime(response['Expires'], '%a, %d %b %Y %H:%M:%S GMT')
self.assertAlmostEqual((expires - now).total_seconds(),
timedelta(seconds=3600).total_seconds(),
delta=2)
self.assert_expires(
response, now, how_soon=timedelta(seconds=3600), tolerance=timedelta(seconds=2)
)

def test_get_asset_object_cache_header(self):
key = get_asset_path(self.item.model, self.asset["name"])
Expand Down Expand Up @@ -542,13 +542,9 @@ def test_head_cache_header(self):
'max-age=3600, public',
msg='Wrong cache-control values'
)

self.assertTrue(response.has_header('Expires'), msg="Expires header missing")

expires = datetime.strptime(response['Expires'], '%a, %d %b %Y %H:%M:%S GMT')
self.assertAlmostEqual((expires - now).total_seconds(),
timedelta(seconds=3600).total_seconds(),
delta=2)
self.assert_expires(
response, now, how_soon=timedelta(seconds=3600), tolerance=timedelta(seconds=2)
)


class ApiDynamicCacheHeaderTestCase(S3TestMixin, MockS3PerTestMixin, StacBaseTestCase):
Expand Down