From 6a9271d8cfe5d4ff56b2375027beb40d11776dc1 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 23 Sep 2024 12:02:57 -0400 Subject: [PATCH] test_simple: fix accidentally skipped test See https://github.com/pypi/warehouse/pull/15716#pullrequestreview-2322699600 Signed-off-by: William Woodruff --- tests/unit/api/test_simple.py | 37 +++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/tests/unit/api/test_simple.py b/tests/unit/api/test_simple.py index ec2367dded73..518a3dea2b95 100644 --- a/tests/unit/api/test_simple.py +++ b/tests/unit/api/test_simple.py @@ -460,17 +460,14 @@ def test_with_files_with_version_multi_digit( if renderer_override is not None: assert db_request.override_renderer == renderer_override - -def _update_context(context, content_type, renderer_override): - if renderer_override != "json" or content_type in [ - simple.MIME_TEXT_HTML, - simple.MIME_PYPI_SIMPLE_V1_HTML, - ]: - return _valid_simple_detail_context(context) - return context - - def test_with_files_quarantined_omitted_from_index(self, db_request): - db_request.accept = "text/html" + @pytest.mark.parametrize( + ("content_type", "renderer_override"), + CONTENT_TYPE_PARAMS, + ) + def test_with_files_quarantined_omitted_from_index( + self, db_request, content_type, renderer_override + ): + db_request.accept = content_type project = ProjectFactory.create(lifecycle_status="quarantine-enter") releases = ReleaseFactory.create_batch(3, project=project) _ = [ @@ -478,9 +475,25 @@ def test_with_files_quarantined_omitted_from_index(self, db_request): for r in releases ] - assert simple.simple_detail(project, db_request) == { + context = { "meta": {"_last-serial": 0, "api-version": API_VERSION}, "name": project.normalized_name, "files": [], "versions": [], + "alternate-locations": [], } + context = _update_context(context, content_type, renderer_override) + + assert simple.simple_detail(project, db_request) == context + + if renderer_override is not None: + assert db_request.override_renderer == renderer_override + + +def _update_context(context, content_type, renderer_override): + if renderer_override != "json" or content_type in [ + simple.MIME_TEXT_HTML, + simple.MIME_PYPI_SIMPLE_V1_HTML, + ]: + return _valid_simple_detail_context(context) + return context