fix CI

sunscrapers · Nov 10, 2024 · 0955972 · 0955972
1 parent 472aaa5
commit 0955972
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/testproject/testapp/tests/test_urls/test_urls.py b/testproject/testapp/tests/test_urls/test_urls.py
@@ -1,6 +1,5 @@
 import json
 import pathlib
-import re
 
 import pytest
 from deepdiff import DeepDiff
@@ -19,12 +18,8 @@ def test_urls_have_not_changed(settings):
     # Function to normalize URL patterns by removing trailing \Z
     # otherwise fails in CI
     def normalize_pattern(pattern):
-        # Remove trailing \Z
-        pattern = re.sub(r"\\Z$", "", pattern)
-        # Remove any format suffixes by identifying "format" capture groups, with or without leading period  # noqa: E501
-        pattern = re.sub(
-            r"\(\?P<format>\\?\.[a-z0-9]+\(\?/?\)?\)", "", pattern
-        )  # noqa: E501
+        if pattern.endswith("/?$"):
+            pattern = pattern[: -len("/?$")] + r"\Z"
         return pattern
 
     def get_all_urls(patterns, prefix=""):

diff --git a/testproject/testapp/tests/test_urls/urls_snapshot.json b/testproject/testapp/tests/test_urls/urls_snapshot.json
@@ -1,10 +1,10 @@
 [
   {
-    "pattern": "^auth/^",
+    "pattern": "^auth/^(?P<format>\\.[a-z0-9]+/?)\\Z",
     "name": "api-root"
   },
   {
-    "pattern": "^auth/^(?P<format>\\.[a-z0-9]+/?)",
+    "pattern": "^auth/^\\Z",
     "name": "api-root"
   },
   {
@@ -24,11 +24,11 @@
     "name": "provider-auth"
   },
   {
-    "pattern": "^auth/^token/login/?$",
+    "pattern": "^auth/^token/login\\Z",
     "name": "login"
   },
   {
-    "pattern": "^auth/^token/logout/?$",
+    "pattern": "^auth/^token/logout\\Z",
     "name": "logout"
   },
   {
@@ -40,83 +40,83 @@
     "name": "user-detail"
   },
   {
-    "pattern": "^auth/^users/(?P<id>[^/.]+)\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/(?P<id>[^/.]+)\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-detail"
   },
   {
     "pattern": "^auth/^users/activation/$",
     "name": "user-activation"
   },
   {
-    "pattern": "^auth/^users/activation\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/activation\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-activation"
   },
   {
     "pattern": "^auth/^users/me/$",
     "name": "user-me"
   },
   {
-    "pattern": "^auth/^users/me\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/me\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-me"
   },
   {
     "pattern": "^auth/^users/resend_activation/$",
     "name": "user-resend-activation"
   },
   {
-    "pattern": "^auth/^users/resend_activation\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/resend_activation\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-resend-activation"
   },
   {
     "pattern": "^auth/^users/reset_password/$",
     "name": "user-reset-password"
   },
   {
-    "pattern": "^auth/^users/reset_password\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/reset_password\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-reset-password"
   },
   {
     "pattern": "^auth/^users/reset_password_confirm/$",
     "name": "user-reset-password-confirm"
   },
   {
-    "pattern": "^auth/^users/reset_password_confirm\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/reset_password_confirm\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-reset-password-confirm"
   },
   {
     "pattern": "^auth/^users/reset_username/$",
     "name": "user-reset-username"
   },
   {
-    "pattern": "^auth/^users/reset_username\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/reset_username\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-reset-username"
   },
   {
     "pattern": "^auth/^users/reset_username_confirm/$",
     "name": "user-reset-username-confirm"
   },
   {
-    "pattern": "^auth/^users/reset_username_confirm\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/reset_username_confirm\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-reset-username-confirm"
   },
   {
     "pattern": "^auth/^users/set_password/$",
     "name": "user-set-password"
   },
   {
-    "pattern": "^auth/^users/set_password\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/set_password\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-set-password"
   },
   {
     "pattern": "^auth/^users/set_username/$",
     "name": "user-set-username"
   },
   {
-    "pattern": "^auth/^users/set_username\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users/set_username\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-set-username"
   },
   {
-    "pattern": "^auth/^users\\.(?P<format>[a-z0-9]+)/?$",
+    "pattern": "^auth/^users\\.(?P<format>[a-z0-9]+)\\Z",
     "name": "user-list"
   },
   {