Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tests/test_invocation_contexts.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def run_function_in_thread_and_propagate_cancellation(func, *args):
t = ThreadWithInvocationID(target=func, args=args)
t.start()
try:
t.join_and_propagate_cancel(1)
t.join_and_propagate_cancel(0.04)
except InvocationCancelledError:
# We still want to return the finished thread if it's
# cancelled.
Expand Down
4 changes: 2 additions & 2 deletions tests/test_server_config_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ def test_unimportable_modules():

with pytest.raises(
ThingImportFailure,
match="\[RuntimeError\] This module should not be importable!",
match=r"\[RuntimeError\] This module should not be importable!",
):
# This checks RuntimErrors get reported with a single error
ThingConfig(cls="tests.unimportable.runtimeerror:SomeClass")

with pytest.raises(
ThingImportFailure,
match="\[ValueError\] This module should not be importable due to ValueError!",
match=r"\[ValueError\] This module should not be importable due to ValueError!",
):
# This checks ValueErrors get reported with a single error
# rather than getting swallowed by a ValidationError
Expand Down