fix tests failing due to default disabled

Author: alexander-alderman-webb

tests/integrations/aiohttp/test_aiohttp.py

@@ -637,15 +637,24 @@ async def handler(request):
 
 
 @pytest.mark.asyncio
+@pytest.mark.parametrize("enable_http_request_source", [None, False])
 async def test_request_source_disabled(
-    sentry_init, aiohttp_raw_server, aiohttp_client, capture_events
+    sentry_init,
+    aiohttp_raw_server,
+    aiohttp_client,
+    capture_events,
+    enable_http_request_source,
 ):
-    sentry_init(
-        integrations=[AioHttpIntegration()],
-        traces_sample_rate=1.0,
-        enable_http_request_source=False,
-        http_request_source_threshold_ms=0,
-    )
+    sentry_options = {
+        "integrations": [AioHttpIntegration()],
+        "traces_sample_rate": 1.0,
+        "http_request_source_threshold_ms": 0,
+    }
+
+    if enable_http_request_source is not None:
+        sentry_options["enable_http_request_source"] = enable_http_request_source
+
+    sentry_init(**sentry_options)
 
     # server for making span request
     async def handler(request):
@@ -680,21 +689,18 @@ async def hello(request):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize("enable_http_request_source", [None, True])
 async def test_request_source_enabled(
     sentry_init,
     aiohttp_raw_server,
     aiohttp_client,
     capture_events,
-    enable_http_request_source,
 ):
     sentry_options = {
         "integrations": [AioHttpIntegration()],
         "traces_sample_rate": 1.0,
+        "enable_http_request_source": True,
         "http_request_source_threshold_ms": 0,
     }
-    if enable_http_request_source is not None:
-        sentry_options["enable_http_request_source"] = enable_http_request_source
 
     sentry_init(**sentry_options)
 

tests/integrations/httpx/test_httpx.py

@@ -396,18 +396,24 @@ def test_omit_url_data_if_parsing_fails(sentry_init, capture_events, httpx_mock)
     assert SPANDATA.HTTP_QUERY not in event["breadcrumbs"]["values"][0]["data"]
 
 
+@pytest.mark.parametrize("enable_http_request_source", [None, False])
 @pytest.mark.parametrize(
     "httpx_client",
     (httpx.Client(), httpx.AsyncClient()),
 )
-def test_request_source_disabled(sentry_init, capture_events, httpx_client, httpx_mock):
+def test_request_source_disabled(
+    sentry_init, capture_events, enable_http_request_source, httpx_client, httpx_mock
+):
     httpx_mock.add_response()
-    sentry_init(
-        integrations=[HttpxIntegration()],
-        traces_sample_rate=1.0,
-        enable_http_request_source=False,
-        http_request_source_threshold_ms=0,
-    )
+    sentry_options = {
+        "integrations": [HttpxIntegration()],
+        "traces_sample_rate": 1.0,
+        "http_request_source_threshold_ms": 0,
+    }
+    if enable_http_request_source is not None:
+        sentry_options["enable_http_request_source"] = enable_http_request_source
+
+    sentry_init(**sentry_options)
 
     events = capture_events()
 
@@ -432,23 +438,18 @@ def test_request_source_disabled(sentry_init, capture_events, httpx_client, http
     assert SPANDATA.CODE_FUNCTION not in data
 
 
-@pytest.mark.parametrize("enable_http_request_source", [None, True])
 @pytest.mark.parametrize(
     "httpx_client",
     (httpx.Client(), httpx.AsyncClient()),
 )
-def test_request_source_enabled(
-    sentry_init, capture_events, enable_http_request_source, httpx_client, httpx_mock
-):
+def test_request_source_enabled(sentry_init, capture_events, httpx_client, httpx_mock):
     httpx_mock.add_response()
     sentry_options = {
         "integrations": [HttpxIntegration()],
         "traces_sample_rate": 1.0,
+        "enable_http_request_source": True,
         "http_request_source_threshold_ms": 0,
     }
-    if enable_http_request_source is not None:
-        sentry_options["enable_http_request_source"] = enable_http_request_source
-
     sentry_init(**sentry_options)
 
     events = capture_events()

tests/integrations/stdlib/test_httplib.py

@@ -376,12 +376,18 @@ def test_option_trace_propagation_targets(
             assert "baggage" not in request_headers
 
 
-def test_request_source_disabled(sentry_init, capture_events):
-    sentry_init(
-        traces_sample_rate=1.0,
-        enable_http_request_source=False,
-        http_request_source_threshold_ms=0,
-    )
+@pytest.mark.parametrize("enable_http_request_source", [None, False])
+def test_request_source_disabled(
+    sentry_init, capture_events, enable_http_request_source
+):
+    sentry_options = {
+        "traces_sample_rate": 1.0,
+        "http_request_source_threshold_ms": 0,
+    }
+    if enable_http_request_source is not None:
+        sentry_options["enable_http_request_source"] = enable_http_request_source
+
+    sentry_init(**sentry_options)
 
     events = capture_events()
 
@@ -403,17 +409,12 @@ def test_request_source_disabled(sentry_init, capture_events):
     assert SPANDATA.CODE_FUNCTION not in data
 
 
-@pytest.mark.parametrize("enable_http_request_source", [None, True])
-def test_request_source_enabled(
-    sentry_init, capture_events, enable_http_request_source
-):
+def test_request_source_enabled(sentry_init, capture_events):
     sentry_options = {
         "traces_sample_rate": 1.0,
+        "enable_http_request_source": True,
         "http_request_source_threshold_ms": 0,
     }
-    if enable_http_request_source is not None:
-        sentry_options["enable_http_request_source"] = enable_http_request_source
-
     sentry_init(**sentry_options)
 
     events = capture_events()