Skip to content

gh-103186: Suppress and assert expected RuntimeWarnings #103244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 16 commits into from
Sep 7, 2023
Merged

gh-103186: Suppress and assert expected RuntimeWarnings #103244

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1eb3a31
Suppress and assert expected RuntimeWarnings
TabLand Apr 4, 2023
cb3e785
Not possible to assert both a warning and error
TabLand Apr 4, 2023
50fec2a
Remove accidentally added warnings import
TabLand Apr 4, 2023
67feacd
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 5, 2023
c9dd306
Run patchcheck.py
arhadthedev Apr 6, 2023
289d2a6
Merge branch 'main' into fix-issue-103186.test_sys_settrace
TabLand Jul 8, 2023
14afb6d
Merge branch 'main' into fix-issue-103186.test_sys_settrace
terryjreedy Jul 10, 2023
58d38b0
Missed 2x tests that warn of unbound locals
TabLand Aug 22, 2023
73d5589
Merge branch 'main' into fix-issue-103186.test_sys_settrace
TabLand Aug 22, 2023
8c88dce
Improve wording and error type for failure edge case
TabLand Sep 3, 2023
121948a
Correction: It is possible to assert both warnings and errors in tandem
TabLand Sep 3, 2023
b3a6909
Use contextlib to simplify with statements and add tandem error and w…
TabLand Sep 6, 2023
49d1951
Remove trailing spaces.
serhiy-storchaka Sep 6, 2023
705941c
Remove self-tests.
serhiy-storchaka Sep 6, 2023
cdfe8b1
Remove unused import
TabLand Sep 6, 2023
b802670
Merge branch 'main' into fix-issue-103186.test_sys_settrace
TabLand Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use contextlib to simplify with statements and add tandem error and w… 
…arning tests
  • Loading branch information
@TabLand
TabLand committed Sep 6, 2023
commit b3a6909416d1f5002e9c145644b40cd2fb62e6ca
60 changes: 38 additions & 22 deletions Lib/test/test_sys_settrace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
from functools import wraps
import asyncio
from test.support import import_helper
import contextlib
import warnings

support.requires_working_socket(module=True)

Expand Down Expand Up @@ -1939,18 +1941,13 @@ def run_test(self, func, jumpFrom, jumpTo, expected, error=None,
tracer = JumpTracer(func, jumpFrom, jumpTo, event, decorated)
sys.settrace(tracer.trace)
output = []

if warning is None and error is None:

with contextlib.ExitStack() as stack:
if error is not None:
stack.enter_context(self.assertRaisesRegex(*error))
if warning is not None:
stack.enter_context(self.assertWarnsRegex(*warning))
func(output)
elif warning is not None and error is None:
with self.assertWarnsRegex(*warning):
func(output)
elif warning is None and error is not None:
with self.assertRaisesRegex(*error):
func(output)
else:
with self.assertRaisesRegex(*error) as error_context, self.assertWarnsRegex(*warning) as warning_context:
func(output)

sys.settrace(None)
self.compare_jump_output(expected, output)
Expand All @@ -1961,18 +1958,13 @@ def run_async_test(self, func, jumpFrom, jumpTo, expected, error=None,
sys.settrace(tracer.trace)
output = []

if warning is None and error is None:
with contextlib.ExitStack() as stack:
if error is not None:
stack.enter_context(self.assertRaisesRegex(*error))
if warning is not None:
stack.enter_context(self.assertWarnsRegex(*warning))
asyncio.run(func(output))
elif warning is not None and error is None:
with self.assertWarnsRegex(*warning):
asyncio.run(func(output))
elif warning is None and error is not None:
with self.assertRaisesRegex(*error):
asyncio.run(func(output))
else:
with self.assertRaisesRegex(*error) as error_context, self.assertWarnsRegex(*warning) as warning_context:
func(output)


sys.settrace(None)
asyncio.set_event_loop_policy(None)
self.compare_jump_output(expected, output)
Expand Down Expand Up @@ -2704,6 +2696,18 @@ class fake_function:
sys.settrace(None)
self.compare_jump_output([2, 3, 2, 3, 4], namespace["output"])

@jump_test(1, 2, [], event='call', error=(Exception, 'Test Error'),
warning=(Warning, 'Test Warning'))
def test_error_and_warning_in_tandem(output):
raise Exception("Test Error")
warnings.warn(Warning("Test Warning"))

@jump_test(1, 2, [], event='call', error=(Exception, 'Test Error'),
warning=(Warning, 'Test Warning'))
def test_warning_and_error_in_tandem(output):
warnings.warn(Warning("Test Warning"))
raise Exception("Test Error")

@jump_test(2, 3, [1], event='call', error=(ValueError, "can't jump from"
" the 'call' trace event of a new frame"))
def test_no_jump_from_call(output):
Expand Down Expand Up @@ -2757,6 +2761,18 @@ def test_jump_backward_over_listcomp_v2(output):
flag = 6
output.append(7)
output.append(8)

@async_jump_test(1, 2, [], event='call', error=(Exception, 'Test Error'),
warning=(Warning, 'Test Warning'))
def test_error_and_warning_in_tandem_async(output):
raise Exception("Test Error")
warnings.warn(Warning("Test Warning"))

@async_jump_test(1, 2, [], event='call', error=(Exception, 'Test Error'),
warning=(Warning, 'Test Warning'))
def test_warning_and_error_in_tandem_async(output):
warnings.warn(Warning("Test Warning"))
raise Exception("Test Error")

@async_jump_test(2, 3, [1, 3], warning=(RuntimeWarning, unbound_locals))
async def test_jump_forward_over_async_listcomp(output):
Expand Down