Merge remote-tracking branch 'origin/master' into potel-base

Author: sl0thentr0py

tests/integrations/excepthook/test_excepthook.py

@@ -42,7 +42,6 @@ def capture_envelope(self, envelope):
         subprocess.check_output([sys.executable, str(app)], stderr=subprocess.STDOUT)
 
     output = excinfo.value.output
-    print(output)
 
     assert b"ZeroDivisionError" in output
     assert b"LOL" in output
@@ -86,7 +85,6 @@ def capture_envelope(self, envelope):
         subprocess.check_output([sys.executable, str(app)], stderr=subprocess.STDOUT)
 
     output = excinfo.value.output
-    print(output)
 
     assert b"ZeroDivisionError" in output
     assert b"LOL" in output

tests/test_api.py

@@ -21,7 +21,6 @@
 from tests.conftest import SortedBaggage
 
 
-@pytest.mark.forked
 def test_get_current_span_current_scope_with_span(sentry_init):
     sentry_init()
 
@@ -31,7 +30,6 @@ def test_get_current_span_current_scope_with_span(sentry_init):
         assert get_current_span() == new_span
 
 
-@pytest.mark.forked
 def test_traceparent_with_tracing_enabled(sentry_init):
     sentry_init(traces_sample_rate=1.0)
 
@@ -43,7 +41,6 @@ def test_traceparent_with_tracing_enabled(sentry_init):
         assert get_traceparent() == expected_traceparent
 
 
-@pytest.mark.forked
 def test_traceparent_with_tracing_disabled(sentry_init):
     sentry_init()
 
@@ -55,7 +52,6 @@ def test_traceparent_with_tracing_disabled(sentry_init):
     assert get_traceparent() == expected_traceparent
 
 
-@pytest.mark.forked
 def test_baggage_with_tracing_disabled(sentry_init):
     sentry_init(release="1.0.0", environment="dev")
     propagation_context = get_isolation_scope()._propagation_context
@@ -67,7 +63,6 @@ def test_baggage_with_tracing_disabled(sentry_init):
     assert get_baggage() == SortedBaggage(expected_baggage)
 
 
-@pytest.mark.forked
 def test_baggage_with_tracing_enabled(sentry_init):
     sentry_init(traces_sample_rate=1.0, release="1.0.0", environment="dev")
     with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.111111):
@@ -76,7 +71,6 @@ def test_baggage_with_tracing_enabled(sentry_init):
             assert get_baggage() == SortedBaggage(expected_baggage)
 
 
-@pytest.mark.forked
 def test_continue_trace(sentry_init):
     sentry_init(traces_sample_rate=1.0)
 
@@ -102,7 +96,6 @@ def test_continue_trace(sentry_init):
             }
 
 
-@pytest.mark.forked
 def test_is_initialized():
     assert not is_initialized()
 
@@ -111,7 +104,6 @@ def test_is_initialized():
     assert is_initialized()
 
 
-@pytest.mark.forked
 def test_get_client():
     client = get_client()
     assert client is not None

tests/test_client.py

@@ -1240,7 +1240,6 @@ def test_error_sampler(_, sentry_init, capture_events, test_config):
         assert len(test_config.sampler_function_mock.call_args[0]) == 2
 
 
-@pytest.mark.forked
 @pytest.mark.parametrize(
     "opt,missing_flags",
     [
@@ -1285,6 +1284,8 @@ class TestSpanClientReports:
     Tests for client reports related to spans.
     """
 
+    __test__ = False
+
     @staticmethod
     def span_dropper(spans_to_drop):
         """