Update sentry-related tests and stop checking versions

This updates the sentry-related tests to match the event payload. It also changes the tests so they no ignore the sentry version number in the event payload. This will reduce future toil when updating the sentry-sdk.
mozilla-services · Nov 4, 2022 · 227ba99 · 227ba99
1 parent f0de9cc
commit 227ba99
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/socorro/unittest/processor/test_processor_app.py b/socorro/unittest/processor/test_processor_app.py
@@ -145,6 +145,10 @@ def test_transform_unexpected_exception(self):
         assert finished_func.call_count == 1
 
 
+# NOTE(willkg): If this changes, we should update it and look for new things that should
+# be scrubbed. Use ANY for things that change between tests like timestamps, source code
+# data (line numbers, file names, post/pre_context), event ids, build ids, versions,
+# etc.
 TRANSFORM_GET_ERROR = {
     "breadcrumbs": ANY,
     "contexts": {
@@ -230,8 +234,8 @@ def test_transform_unexpected_exception(self):
             "threading",
         ],
         "name": "sentry.python",
-        "packages": [{"name": "pypi:sentry-sdk", "version": "1.9.10"}],
-        "version": "1.9.10",
+        "packages": [{"name": "pypi:sentry-sdk", "version": ANY}],
+        "version": ANY,
     },
     "server_name": "testhost",
     "timestamp": ANY,

diff --git a/socorro/unittest/processor/test_processor_pipeline.py b/socorro/unittest/processor/test_processor_pipeline.py
@@ -43,7 +43,9 @@ def set_up_sentry():
 
 
 # NOTE(willkg): If this changes, we should update it and look for new things that should
-# be scrubbed. Use ANY for things that change between tests.
+# be scrubbed. Use ANY for things that change between tests like timestamps, source code
+# data (line numbers, file names, post/pre_context), event ids, build ids, versions,
+# etc.
 RULE_ERROR_EVENT = {
     "breadcrumbs": {"values": []},
     "contexts": {
@@ -120,8 +122,8 @@ def set_up_sentry():
             "threading",
         ],
         "name": "sentry.python",
-        "packages": [{"name": "pypi:sentry-sdk", "version": "1.9.10"}],
-        "version": "1.9.10",
+        "packages": [{"name": "pypi:sentry-sdk", "version": ANY}],
+        "version": ANY,
     },
     "server_name": "test_processor",
     "timestamp": ANY,

diff --git a/webapp-django/crashstats/crashstats/tests/test_sentry.py b/webapp-django/crashstats/crashstats/tests/test_sentry.py
@@ -18,7 +18,9 @@
 
 
 # NOTE(willkg): If this changes, we should update it and look for new things that should
-# be scrubbed. Use ANY for things that change between tests.
+# be scrubbed. Use ANY for things that change between tests like timestamps, source code
+# data (line numbers, file names, post/pre_context), event ids, build ids, versions,
+# etc.
 BROKEN_EVENT = {
     "breadcrumbs": ANY,
     "contexts": {
@@ -29,7 +31,7 @@
         },
         "trace": {
             "description": "sentry_sdk.integrations.django._got_request_exception",
-            "op": "django.signals",
+            "op": "event.django",
             "parent_span_id": ANY,
             "span_id": ANY,
             "trace_id": ANY,
@@ -114,9 +116,9 @@
             "stdlib",
             "threading",
         ],
-        "name": "sentry.python",
-        "packages": [{"name": "pypi:sentry-sdk", "version": "1.9.10"}],
-        "version": "1.9.10",
+        "name": "sentry.python.django",
+        "packages": [{"name": "pypi:sentry-sdk", "version": ANY}],
+        "version": ANY,
     },
     "server_name": ANY,
     "timestamp": ANY,