Reenable tests

Author: antonpirker

tests/integrations/threading/test_threading.py

@@ -1,7 +1,6 @@
 import gc
 from concurrent import futures
-
-# from textwrap import dedent
+from textwrap import dedent
 from threading import Thread
 
 import pytest
@@ -176,101 +175,101 @@ def target():
     assert t.run.__qualname__ == original_run.__qualname__
 
 
-# @pytest.mark.parametrize(
-#     "propagate_scope",
-#     (True, False),
-#     ids=["propagate_scope=True", "propagate_scope=False"],
-# )
-# def test_scope_data_not_leaked_in_threads(sentry_init, propagate_scope):
-#     sentry_init(
-#         integrations=[ThreadingIntegration(propagate_scope=propagate_scope)],
-#     )
-
-#     sentry_sdk.set_tag("initial_tag", "initial_value")
-#     initial_iso_scope = sentry_sdk.get_isolation_scope()
-
-#     def do_some_work():
-#         # check if we have the initial scope data propagated into the thread
-#         if propagate_scope:
-#             assert sentry_sdk.get_isolation_scope()._tags == {
-#                 "initial_tag": "initial_value"
-#             }
-#         else:
-#             assert sentry_sdk.get_isolation_scope()._tags == {}
-
-#         # change data in isolation scope in thread
-#         sentry_sdk.set_tag("thread_tag", "thread_value")
-
-#     t = Thread(target=do_some_work)
-#     t.start()
-#     t.join()
-
-#     # check if the initial scope data is not modified by the started thread
-#     assert initial_iso_scope._tags == {
-#         "initial_tag": "initial_value"
-#     }, "The isolation scope in the main thread should not be modified by the started thread."
-
-
-# @pytest.mark.parametrize(
-#     "propagate_scope",
-#     (True, False),
-#     ids=["propagate_scope=True", "propagate_scope=False"],
-# )
-# def test_spans_from_multiple_threads(
-#     sentry_init, capture_events, render_span_tree, propagate_scope
-# ):
-#     sentry_init(
-#         traces_sample_rate=1.0,
-#         integrations=[ThreadingIntegration(propagate_scope=propagate_scope)],
-#     )
-#     events = capture_events()
-
-#     def do_some_work(number):
-#         with sentry_sdk.start_span(
-#             op=f"inner-run-{number}", name=f"Thread: child-{number}"
-#         ):
-#             pass
-
-#     threads = []
-
-#     with sentry_sdk.start_transaction(op="outer-trx"):
-#         for number in range(5):
-#             with sentry_sdk.start_span(
-#                 op=f"outer-submit-{number}", name="Thread: main"
-#             ):
-#                 t = Thread(target=do_some_work, args=(number,))
-#                 t.start()
-#                 threads.append(t)
-
-#         for t in threads:
-#             t.join()
-
-#     (event,) = events
-#     if propagate_scope:
-#         assert render_span_tree(event) == dedent(
-#             """\
-#             - op="outer-trx": description=null
-#               - op="outer-submit-0": description="Thread: main"
-#                 - op="inner-run-0": description="Thread: child-0"
-#               - op="outer-submit-1": description="Thread: main"
-#                 - op="inner-run-1": description="Thread: child-1"
-#               - op="outer-submit-2": description="Thread: main"
-#                 - op="inner-run-2": description="Thread: child-2"
-#               - op="outer-submit-3": description="Thread: main"
-#                 - op="inner-run-3": description="Thread: child-3"
-#               - op="outer-submit-4": description="Thread: main"
-#                 - op="inner-run-4": description="Thread: child-4"\
-# """
-#         )
-
-#     elif not propagate_scope:
-#         assert render_span_tree(event) == dedent(
-#             """\
-#             - op="outer-trx": description=null
-#               - op="outer-submit-0": description="Thread: main"
-#               - op="outer-submit-1": description="Thread: main"
-#               - op="outer-submit-2": description="Thread: main"
-#               - op="outer-submit-3": description="Thread: main"
-#               - op="outer-submit-4": description="Thread: main"\
-# """
-#         )
+@pytest.mark.parametrize(
+    "propagate_scope",
+    (True, False),
+    ids=["propagate_scope=True", "propagate_scope=False"],
+)
+def test_scope_data_not_leaked_in_threads(sentry_init, propagate_scope):
+    sentry_init(
+        integrations=[ThreadingIntegration(propagate_scope=propagate_scope)],
+    )
+
+    sentry_sdk.set_tag("initial_tag", "initial_value")
+    initial_iso_scope = sentry_sdk.get_isolation_scope()
+
+    def do_some_work():
+        # check if we have the initial scope data propagated into the thread
+        if propagate_scope:
+            assert sentry_sdk.get_isolation_scope()._tags == {
+                "initial_tag": "initial_value"
+            }
+        else:
+            assert sentry_sdk.get_isolation_scope()._tags == {}
+
+        # change data in isolation scope in thread
+        sentry_sdk.set_tag("thread_tag", "thread_value")
+
+    t = Thread(target=do_some_work)
+    t.start()
+    t.join()
+
+    # check if the initial scope data is not modified by the started thread
+    assert initial_iso_scope._tags == {
+        "initial_tag": "initial_value"
+    }, "The isolation scope in the main thread should not be modified by the started thread."
+
+
+@pytest.mark.parametrize(
+    "propagate_scope",
+    (True, False),
+    ids=["propagate_scope=True", "propagate_scope=False"],
+)
+def test_spans_from_multiple_threads(
+    sentry_init, capture_events, render_span_tree, propagate_scope
+):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[ThreadingIntegration(propagate_scope=propagate_scope)],
+    )
+    events = capture_events()
+
+    def do_some_work(number):
+        with sentry_sdk.start_span(
+            op=f"inner-run-{number}", name=f"Thread: child-{number}"
+        ):
+            pass
+
+    threads = []
+
+    with sentry_sdk.start_transaction(op="outer-trx"):
+        for number in range(5):
+            with sentry_sdk.start_span(
+                op=f"outer-submit-{number}", name="Thread: main"
+            ):
+                t = Thread(target=do_some_work, args=(number,))
+                t.start()
+                threads.append(t)
+
+        for t in threads:
+            t.join()
+
+    (event,) = events
+    if propagate_scope:
+        assert render_span_tree(event) == dedent(
+            """\
+            - op="outer-trx": description=null
+              - op="outer-submit-0": description="Thread: main"
+                - op="inner-run-0": description="Thread: child-0"
+              - op="outer-submit-1": description="Thread: main"
+                - op="inner-run-1": description="Thread: child-1"
+              - op="outer-submit-2": description="Thread: main"
+                - op="inner-run-2": description="Thread: child-2"
+              - op="outer-submit-3": description="Thread: main"
+                - op="inner-run-3": description="Thread: child-3"
+              - op="outer-submit-4": description="Thread: main"
+                - op="inner-run-4": description="Thread: child-4"\
+"""
+        )
+
+    elif not propagate_scope:
+        assert render_span_tree(event) == dedent(
+            """\
+            - op="outer-trx": description=null
+              - op="outer-submit-0": description="Thread: main"
+              - op="outer-submit-1": description="Thread: main"
+              - op="outer-submit-2": description="Thread: main"
+              - op="outer-submit-3": description="Thread: main"
+              - op="outer-submit-4": description="Thread: main"\
+"""
+        )