Merge issue #97 deployment smoke parity

Author: alexeygrigorev

_docs/compatibility/development-terminology-allowlist.json

@@ -180,7 +180,7 @@
     },
     {
       "path": "core/tests/test_deployment_release.py",
-      "sha256": "294d3a34c17bfa6c9eb15f1383d5cab43771e2b0fefdd04e23a278f4e57d22f3",
+      "sha256": "155633580c16bca93c8021b06ba65e8a28760597c45eddb157d134e3f73cf533",
       "class": "legacy_contract_test",
       "reason": "Release tests exercise exact physical task, secret, repository, and tag values.",
       "follow_up": "#94",

core/tests/test_deployment_release.py

@@ -1746,6 +1746,7 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
                 200,
                 noindex,
                 b"Learn data skills. For free. Together."
+                b'<link rel="canonical" href="https://datatalks.club/courses/">'
                 b'<link rel="stylesheet" href="/static/courses.fixture.css">',
             ),
             Response(
@@ -1795,12 +1796,18 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
             )
             persisted = path.read_text()
             self.assertEqual(__import__("json").loads(persisted), evidence)
+            courses_check = next(
+                check for check in evidence["checks"] if check.get("path") == "/courses/"
+            )
+            self.assertTrue(courses_check["exact_canonical"])
+            self.assertNotIn("canonical_absent", courses_check)
             self.assertEqual(evidence["checks"][-1]["runtime_group"], "analytics")
             for forbidden in ("cookie", "authorization", "set-cookie", "response_body"):
                 self.assertNotIn(forbidden, persisted.lower())
 
         invalid_surface_responses = (
             (
+                "home identity",
                 2,
                 Response(
                     200,
@@ -1811,6 +1818,7 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
                 "home page lacks expected content",
             ),
             (
+                "course identity",
                 4,
                 Response(
                     200,
@@ -1821,8 +1829,8 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
                 "course discovery lacks expected content",
             ),
         )
-        for response_index, invalid_response, error_message in invalid_surface_responses:
-            with self.subTest(error_message=error_message):
+        for case, response_index, invalid_response, error_message in invalid_surface_responses:
+            with self.subTest(case=case):
                 invalid_responses = [*responses]
                 invalid_responses[response_index] = invalid_response
                 with (
@@ -1831,6 +1839,38 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
                 ):
                     run_http_smoke("https://web.dtcdev.click", SHA_A)
 
+        exact_courses_canonical = b'<link rel="canonical" href="https://datatalks.club/courses/">'
+        invalid_courses_canonicals = (
+            ("missing", b""),
+            ("duplicate", exact_courses_canonical * 2),
+            (
+                "wrong path",
+                b'<link rel="canonical" href="https://datatalks.club/courses/wrong/">',
+            ),
+            (
+                "external",
+                b'<link rel="canonical" href="https://example.com/courses/">',
+            ),
+        )
+        for case, rendered_canonical in invalid_courses_canonicals:
+            invalid_responses = [*responses]
+            invalid_responses[4] = Response(
+                200,
+                noindex,
+                b"Learn data skills. For free. Together."
+                + rendered_canonical
+                + b'<link rel="stylesheet" href="/static/courses.fixture.css">',
+            )
+            with (
+                self.subTest(case=case),
+                patch("deploy.smoke._request", side_effect=invalid_responses),
+                self.assertRaisesMessage(
+                    ReleaseContractError,
+                    "course discovery production canonical differs",
+                ),
+            ):
+                run_http_smoke("https://web.dtcdev.click", SHA_A)
+
         invalid_admin_responses = (
             (
                 Response(

deploy/smoke.py

@@ -165,8 +165,9 @@ def run_http_smoke(
         raise ReleaseContractError("course discovery lacks expected content")
     if "The place to talk about data" in courses_html:
         raise ReleaseContractError("course discovery regressed to the main-site home")
-    if 'rel="canonical"' in courses_html:
-        raise ReleaseContractError("adopted course discovery has a guessed canonical")
+    courses_canonical = '<link rel="canonical" href="https://datatalks.club/courses/">'
+    if courses_html.count(courses_canonical) != 1 or courses_html.count('rel="canonical"') != 1:
+        raise ReleaseContractError("course discovery production canonical differs")
 
     studio = _request(origin, "/studio/")
     if studio.status not in {301, 302, 303, 307, 308}:
@@ -269,7 +270,7 @@ def run_http_smoke(
                 "status": 200,
                 "noindex": True,
                 "course_discovery": True,
-                "canonical_absent": True,
+                "exact_canonical": True,
             },
             {
                 "path": "/studio/",