fix: Fix tests when running outside of tox, with all integrations

untitaker · untitaker · commit 8ba8c21d4ff4 · 2018-09-22T13:02:54.000+02:00
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
@@ -17,7 +17,9 @@ def install_httplib(self):
         real_getresponse = self.httplib_connection_cls.getresponse
 
         def putrequest(self, method, url, *args, **kwargs):
+            rv = real_putrequest(self, method, url, *args, **kwargs)
             self._sentrysdk_data_dict = data = {}
+
             host = self.host
             port = self.port
             default_port = self.default_port
@@ -30,13 +32,15 @@ def putrequest(self, method, url, *args, **kwargs):
                     port != default_port and ":%s" % port or "",
                     url,
                 )
+
             data["url"] = real_url
             data["method"] = method
-            return real_putrequest(self, method, url, *args, **kwargs)
+            return rv
 
         def getresponse(self, *args, **kwargs):
             rv = real_getresponse(self, *args, **kwargs)
             data = getattr(self, "_sentrysdk_data_dict", None) or {}
+
             if "status_code" not in data:
                 data["status_code"] = rv.status
                 data["reason"] = rv.reason
diff --git a/tests/integrations/django/myapp/settings.py b/tests/integrations/django/myapp/settings.py
@@ -11,10 +11,6 @@
 """
 
 import os
-import sentry_sdk
-
-from sentry_sdk.integrations.django import DjangoIntegration
-
 
 try:
     # Django >= 1.10
@@ -129,7 +125,3 @@ def process_response(self, request, response):
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 
 STATIC_URL = "/static/"
-
-sentry_sdk.api._init_on_current(
-    integrations=[DjangoIntegration()], send_default_pii=True
-)
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
@@ -12,14 +12,19 @@
 except ImportError:
     from django.core.urlresolvers import reverse
 
-from sentry_sdk import Hub, last_event_id
+from sentry_sdk import last_event_id
+from sentry_sdk.integrations.django import DjangoIntegration
 
 from tests.integrations.django.myapp.wsgi import application
 
 
+@pytest.fixture(autouse=True)
+def init_django_sentry(sentry_init):
+    sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+
+
 @pytest.fixture
-def client(monkeypatch_test_transport):
-    monkeypatch_test_transport(Hub.current.client)
+def client():
     return Client(application)
 
 
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
@@ -1,8 +1,15 @@
+import pytest
+
 try:
     from urllib.request import urlopen
 except ImportError:
     from urllib import urlopen
 
+try:
+    from httplib import HTTPConnection
+except ImportError:
+    from http.client import HTTPConnection
+
 from sentry_sdk import capture_message
 from sentry_sdk.integrations.stdlib import StdlibIntegration
 
@@ -55,3 +62,44 @@ def before_breadcrumb(crumb, hint):
         "reason": "OK",
         "extra": "foo",
     }
+
+
+def test_httplib_misuse(sentry_init, capture_events):
+    """HTTPConnection.getresponse must be called after every call to
+    HTTPConnection.request. However, if somebody does not abide by
+    this contract, we still should handle this gracefully and not
+    send mixed breadcrumbs.
+
+    Test whether our breadcrumbs are coherent when somebody uses HTTPConnection
+    wrongly.
+    """
+
+    sentry_init()
+    events = capture_events()
+
+    conn = HTTPConnection("httpbin.org", 80)
+    conn.request("GET", "/anything/foo")
+
+    with pytest.raises(Exception):
+        # This raises an exception, because we didn't call `getresponse` for
+        # the previous request yet.
+        #
+        # This call should not affect our breadcrumb.
+        conn.request("POST", "/anything/bar")
+
+    response = conn.getresponse()
+    assert response._method == "GET"
+
+    capture_message("Testing!")
+
+    event, = events
+    crumb, = event["breadcrumbs"]
+
+    assert crumb["type"] == "http"
+    assert crumb["category"] == "httplib"
+    assert crumb["data"] == {
+        "url": "http://httpbin.org/anything/foo",
+        "method": "GET",
+        "status_code": 200,
+        "reason": "OK",
+    }
