fix moar tests and faulty logic

Author: BYK

sentry_sdk/transport.py

@@ -806,7 +806,7 @@ def make_transport(options):
     # We default to using HTTP2 transport if the user also has the required h2
     # library installed (through the subclass check). The reason is h2 not being
     # available on py3.7 which we still support.
-    use_http2_transport = options.get("http2", True) and not issubclass(
+    use_http2_transport = options.get("http2") != False and not issubclass(
         Http2Transport, HttpTransport
     )
 

tests/integrations/typer/test_typer.py

@@ -26,7 +26,7 @@ def capture_envelope(self, envelope):
         if event is not None:
             print(event)
 
-    transport.HttpTransport.capture_envelope = capture_envelope
+    transport.BaseHttpTransport.capture_envelope = capture_envelope
 
     init("http://foobar@localhost/123", integrations=[TyperIntegration()])
 

tests/test_client.py

@@ -362,8 +362,8 @@ def test_proxy(monkeypatch, testcase, http2):
 def test_socks_proxy(testcase, http2):
     kwargs = {}
 
-    if not http2:
-        kwargs["http2"] = False
+    if http2:
+        kwargs["_experiments"] = {"transport_http2": True}
 
     if testcase["arg_http_proxy"] is not None:
         kwargs["http_proxy"] = testcase["arg_http_proxy"]
@@ -565,10 +565,10 @@ def test_capture_event_works(sentry_init):
 )
 def test_atexit(tmpdir, monkeypatch, num_messages, http2):
     if http2:
-        options = "http2=True"
+        options = '_experiments={"transport_http2": True}'
         transport = "Http2Transport"
     else:
-        options = "http2=False"
+        options = ""
         transport = "HttpTransport"
 
     app = tmpdir.join("app.py")

tests/test_transport.py

@@ -213,7 +213,7 @@ def test_transport_num_pools(make_client, num_pools, expected_num_pools):
     if num_pools is not None:
         _experiments["transport_num_pools"] = num_pools
 
-    client = make_client(_experiments=_experiments)
+    client = make_client(_experiments=_experiments, http2=False)
 
     options = client.transport._get_pool_options()
     assert options["num_pools"] == expected_num_pools
@@ -254,20 +254,20 @@ def test_socket_options(make_client):
 
 
 def test_keep_alive_true(make_client):
-    client = make_client(keep_alive=True)
+    client = make_client(keep_alive=True, http2=False)
 
     options = client.transport._get_pool_options()
     assert options["socket_options"] == KEEP_ALIVE_SOCKET_OPTIONS
 
 
 def test_keep_alive_on_by_default(make_client):
-    client = make_client()
+    client = make_client(http2=False)
     options = client.transport._get_pool_options()
     assert "socket_options" not in options
 
 
 def test_default_timeout(make_client):
-    client = make_client()
+    client = make_client(http2=False)
 
     options = client.transport._get_pool_options()
     assert "timeout" in options
@@ -320,19 +320,44 @@ def test_socket_options_override_keep_alive(make_client):
         (socket.SOL_TCP, socket.TCP_KEEPCNT, 6),
     ]
 
-    client = make_client(socket_options=socket_options, keep_alive=False)
+    client = make_client(socket_options=socket_options, keep_alive=False, http2=False)
 
     options = client.transport._get_pool_options()
     assert options["socket_options"] == socket_options
 
 
+@pytest.mark.skipif(not PY38, reason="HTTP2 libraries are only available in py3.8+")
+def test_socket_options_merge_with_keep_alive_http2(make_client):
+    socket_options = [
+        (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 42),
+        (socket.SOL_TCP, socket.TCP_KEEPINTVL, 42),
+    ]
+
+    client = make_client(socket_options=socket_options)
+
+    options = client.transport._get_pool_options()
+    try:
+        assert options["socket_options"] == [
+            (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 42),
+            (socket.SOL_TCP, socket.TCP_KEEPINTVL, 42),
+            (socket.SOL_TCP, socket.TCP_KEEPIDLE, 45),
+            (socket.SOL_TCP, socket.TCP_KEEPCNT, 6),
+        ]
+    except AttributeError:
+        assert options["socket_options"] == [
+            (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 42),
+            (socket.SOL_TCP, socket.TCP_KEEPINTVL, 42),
+            (socket.SOL_TCP, socket.TCP_KEEPCNT, 6),
+        ]
+
+
 def test_socket_options_merge_with_keep_alive(make_client):
     socket_options = [
         (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 42),
         (socket.SOL_TCP, socket.TCP_KEEPINTVL, 42),
     ]
 
-    client = make_client(socket_options=socket_options, keep_alive=True)
+    client = make_client(socket_options=socket_options, keep_alive=True, http2=False)
 
     options = client.transport._get_pool_options()
     try:
@@ -350,12 +375,23 @@ def test_socket_options_merge_with_keep_alive(make_client):
         ]
 
 
-def test_socket_options_override_defaults(make_client):
+@pytest.mark.skipif(not PY38, reason="HTTP2 libraries are only available in py3.8+")
+def test_socket_options_override_defaults_http2(make_client):
     # If socket_options are set to [], this doesn't mean the user doesn't want
     # any custom socket_options, but rather that they want to disable the urllib3
     # socket option defaults, so we need to set this and not ignore it.
     client = make_client(socket_options=[])
 
+    options = client.transport._get_pool_options()
+    assert options["socket_options"] == KEEP_ALIVE_SOCKET_OPTIONS
+
+
+def test_socket_options_override_defaults(make_client):
+    # If socket_options are set to [], this doesn't mean the user doesn't want
+    # any custom socket_options, but rather that they want to disable the urllib3
+    # socket option defaults, so we need to set this and not ignore it.
+    client = make_client(http2=False, socket_options=[])
+
     options = client.transport._get_pool_options()
     assert options["socket_options"] == []