Browse Source

ref: fix typing of slack test_requests (#70507)

<!-- Describe your PR here. -->
anthony sottile 10 months ago
parent
commit
17d2b87e39
2 changed files with 7 additions and 18 deletions
  1. 0 1
      pyproject.toml
  2. 7 17
      tests/sentry/integrations/slack/test_requests.py

+ 0 - 1
pyproject.toml

@@ -531,7 +531,6 @@ module = [
     "tests.sentry.incidents.test_logic",
     "tests.sentry.ingest.test_slicing",
     "tests.sentry.integrations.github.test_client",
-    "tests.sentry.integrations.slack.test_requests",
     "tests.sentry.issues.test_utils",
     "tests.sentry.models.test_organizationmember",
     "tests.sentry.replays.test_project_replay_recording_segment_index",

+ 7 - 17
tests/sentry/integrations/slack/test_requests.py

@@ -74,36 +74,26 @@ class SlackRequestTest(TestCase):
             },
         }
 
-    def test_validate_existence_of_data(self):
-        type(self.request).DATA = mock.PropertyMock(side_effect=ValueError())
-
-        with pytest.raises(SlackRequestError):
-            self.slack_request.validate()
-
+    @pytest.mark.xfail(strict=True, reason="crashes in _log_request before validation can occur")
     def test_returns_400_on_invalid_data(self):
-        type(self.request).DATA = mock.PropertyMock(side_effect=ValueError())
+        type(self.request).data = mock.PropertyMock(side_effect=ValueError())
 
         with pytest.raises(SlackRequestError) as e:
             self.slack_request.validate()
-            assert e.status == 400
-
-    def test_validates_token(self):
-        self.request.data["token"] = "notthetoken"
-
-        with pytest.raises(SlackRequestError):
-            self.slack_request.validate()
+        assert e.value.status == 400
 
+    @override_options({"slack.signing-secret": None})  # force token-auth
     def test_returns_401_on_invalid_token(self):
         self.request.data["token"] = "notthetoken"
 
         with pytest.raises(SlackRequestError) as e:
             self.slack_request.validate()
-            assert e.status == 401
+        assert e.value.status == 401
 
     def test_validates_existence_of_integration(self):
         with pytest.raises(SlackRequestError) as e:
             self.slack_request.validate()
-            assert e.status == 403
+        assert e.value.status == 403
 
     def test_none_in_data(self):
         request = mock.Mock()
@@ -201,7 +191,7 @@ class SlackEventRequestTest(TestCase):
         self.request.META = set_signing_secret("bad_key", self.request.body)
         with pytest.raises(SlackRequestError) as e:
             self.slack_request.validate()
-            assert e.status == 401
+        assert e.value.status == 401
 
     def test_use_verification_token(self):
         with override_options({"slack.signing-secret": None}):