Skip to content

Commit 647b3ba

Browse files
authored
Merge branch 'master' into ivana/3.14-rc1
2 parents 338474b + e329179 commit 647b3ba

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

sentry_sdk/integrations/threading.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def _run_old_run_func():
120120
# type: () -> Any
121121
try:
122122
self = current_thread()
123-
return old_run_func(self, *a, **kw)
123+
return old_run_func(self, *a[1:], **kw)
124124
except Exception:
125125
reraise(*_capture_exception())
126126

tests/integrations/threading/test_threading.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
original_run = Thread.run
1414

1515

16+
@pytest.mark.filterwarnings("ignore:.*:pytest.PytestUnhandledThreadExceptionWarning")
1617
@pytest.mark.parametrize("integrations", [[ThreadingIntegration()], []])
1718
def test_handles_exceptions(sentry_init, capture_events, integrations):
1819
sentry_init(default_integrations=False, integrations=integrations)
@@ -36,6 +37,7 @@ def crash():
3637
assert not events
3738

3839

40+
@pytest.mark.filterwarnings("ignore:.*:pytest.PytestUnhandledThreadExceptionWarning")
3941
@pytest.mark.parametrize("propagate_hub", (True, False))
4042
def test_propagates_hub(sentry_init, capture_events, propagate_hub):
4143
sentry_init(
@@ -125,6 +127,7 @@ def run(self):
125127
assert unreachable_objects == 0
126128

127129

130+
@pytest.mark.filterwarnings("ignore:.*:pytest.PytestUnhandledThreadExceptionWarning")
128131
def test_double_patching(sentry_init, capture_events):
129132
sentry_init(default_integrations=False, integrations=[ThreadingIntegration()])
130133
events = capture_events()

0 commit comments

Comments
 (0)