Skip to content

bpo-33041: Add tests for jumps in/out of 'async with' blocks. #6110

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 1 commit into from
Mar 18, 2018
Merged

bpo-33041: Add tests for jumps in/out of 'async with' blocks. #6110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
117 changes: 117 additions & 0 deletions Lib/test/test_sys_settrace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import difflib
import gc
from functools import wraps
import asyncio


class tracecontext:
"""Context manager that traces its enter and exit."""
Expand All @@ -19,6 +21,20 @@ def __enter__(self):
def __exit__(self, *exc_info):
self.output.append(-self.value)

class asynctracecontext:
"""Asynchronous context manager that traces its aenter and aexit."""
def __init__(self, output, value):
self.output = output
self.value = value

async def __aenter__(self):
self.output.append(self.value)

async def __aexit__(self, *exc_info):
self.output.append(-self.value)



# A very basic example. If this fails, we're in deep trouble.
def basic():
return 1
Expand Down Expand Up @@ -636,6 +652,19 @@ def run_test(self, func, jumpFrom, jumpTo, expected, error=None,
sys.settrace(None)
self.compare_jump_output(expected, output)

def run_async_test(self, func, jumpFrom, jumpTo, expected, error=None,
event='line', decorated=False):
tracer = JumpTracer(func, jumpFrom, jumpTo, event, decorated)
sys.settrace(tracer.trace)
output = []
if error is None:
asyncio.run(func(output))
else:
with self.assertRaisesRegex(*error):
asyncio.run(func(output))
sys.settrace(None)
self.compare_jump_output(expected, output)

def jump_test(jumpFrom, jumpTo, expected, error=None, event='line'):
"""Decorator that creates a test that makes a jump
from one place to another in the following code.
Expand All @@ -648,6 +677,18 @@ def test(self):
return test
return decorator

def async_jump_test(jumpFrom, jumpTo, expected, error=None, event='line'):
"""Decorator that creates a test that makes a jump
from one place to another in the following asynchronous code.
"""
def decorator(func):
@wraps(func)
def test(self):
self.run_async_test(func, jumpFrom, jumpTo, expected,
error=error, event=event, decorated=True)
return test
return decorator

## The first set of 'jump' tests are for things that are allowed:

@jump_test(1, 3, [3])
Expand Down Expand Up @@ -774,12 +815,24 @@ def test_jump_forwards_out_of_with_block(output):
output.append(2)
output.append(3)

@async_jump_test(2, 3, [1, 3])
async def test_jump_forwards_out_of_async_with_block(output):
async with asynctracecontext(output, 1):
output.append(2)
output.append(3)

@jump_test(3, 1, [1, 2, 1, 2, 3, -2])
def test_jump_backwards_out_of_with_block(output):
output.append(1)
with tracecontext(output, 2):
output.append(3)

@async_jump_test(3, 1, [1, 2, 1, 2, 3, -2])
async def test_jump_backwards_out_of_async_with_block(output):
output.append(1)
async with asynctracecontext(output, 2):
output.append(3)

@jump_test(2, 5, [5])
def test_jump_forwards_out_of_try_finally_block(output):
try:
Expand Down Expand Up @@ -843,6 +896,14 @@ def test_jump_across_with(output):
with tracecontext(output, 4):
output.append(5)

@async_jump_test(2, 4, [1, 4, 5, -4])
async def test_jump_across_async_with(output):
output.append(1)
async with asynctracecontext(output, 2):
output.append(3)
async with asynctracecontext(output, 4):
output.append(5)

@jump_test(4, 5, [1, 3, 5, 6])
def test_jump_out_of_with_block_within_for_block(output):
output.append(1)
Expand All @@ -852,6 +913,15 @@ def test_jump_out_of_with_block_within_for_block(output):
output.append(5)
output.append(6)

@async_jump_test(4, 5, [1, 3, 5, 6])
async def test_jump_out_of_async_with_block_within_for_block(output):
output.append(1)
for i in [1]:
async with asynctracecontext(output, 3):
output.append(4)
output.append(5)
output.append(6)

@jump_test(4, 5, [1, 2, 3, 5, -2, 6])
def test_jump_out_of_with_block_within_with_block(output):
output.append(1)
Expand All @@ -861,6 +931,15 @@ def test_jump_out_of_with_block_within_with_block(output):
output.append(5)
output.append(6)

@async_jump_test(4, 5, [1, 2, 3, 5, -2, 6])
async def test_jump_out_of_async_with_block_within_with_block(output):
output.append(1)
with tracecontext(output, 2):
async with asynctracecontext(output, 3):
output.append(4)
output.append(5)
output.append(6)

@jump_test(5, 6, [2, 4, 6, 7])
def test_jump_out_of_with_block_within_finally_block(output):
try:
Expand All @@ -871,6 +950,16 @@ def test_jump_out_of_with_block_within_finally_block(output):
output.append(6)
output.append(7)

@async_jump_test(5, 6, [2, 4, 6, 7])
async def test_jump_out_of_async_with_block_within_finally_block(output):
try:
output.append(2)
finally:
async with asynctracecontext(output, 4):
output.append(5)
output.append(6)
output.append(7)

@jump_test(8, 11, [1, 3, 5, 11, 12])
def test_jump_out_of_complex_nested_blocks(output):
output.append(1)
Expand All @@ -894,6 +983,14 @@ def test_jump_out_of_with_assignment(output):
output.append(4)
output.append(5)

@async_jump_test(3, 5, [1, 2, 5])
async def test_jump_out_of_async_with_assignment(output):
output.append(1)
async with asynctracecontext(output, 2) \
as x:
output.append(4)
output.append(5)

@jump_test(3, 6, [1, 6, 8, 9])
def test_jump_over_return_in_try_finally_block(output):
output.append(1)
Expand Down Expand Up @@ -996,12 +1093,24 @@ def test_no_jump_forwards_into_with_block(output):
with tracecontext(output, 2):
output.append(3)

@async_jump_test(1, 3, [], (ValueError, 'into'))
async def test_no_jump_forwards_into_async_with_block(output):
output.append(1)
async with asynctracecontext(output, 2):
output.append(3)

@jump_test(3, 2, [1, 2, -1], (ValueError, 'into'))
def test_no_jump_backwards_into_with_block(output):
with tracecontext(output, 1):
output.append(2)
output.append(3)

@async_jump_test(3, 2, [1, 2, -1], (ValueError, 'into'))
async def test_no_jump_backwards_into_async_with_block(output):
async with asynctracecontext(output, 1):
output.append(2)
output.append(3)

@jump_test(1, 3, [], (ValueError, 'into'))
def test_no_jump_forwards_into_try_finally_block(output):
output.append(1)
Expand Down Expand Up @@ -1082,6 +1191,14 @@ def test_no_jump_between_with_blocks(output):
with tracecontext(output, 4):
output.append(5)

@async_jump_test(3, 5, [1, 2, -2], (ValueError, 'into'))
async def test_no_jump_between_async_with_blocks(output):
output.append(1)
async with asynctracecontext(output, 2):
output.append(3)
async with asynctracecontext(output, 4):
output.append(5)

@jump_test(5, 7, [2, 4], (ValueError, 'finally'))
def test_no_jump_over_return_out_of_finally_block(output):
try:
Expand Down