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/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def neo4j_session(neo4j_driver):
# async support for pytest-benchmark
# https://github.com/ionelmc/pytest-benchmark/issues/66
@pytest_asyncio.fixture
async def aio_benchmark(benchmark, event_loop):
def aio_benchmark(benchmark, event_loop):
def _wrapper(func, *args, **kwargs):
if asyncio.iscoroutinefunction(func):
@benchmark
Expand Down
23 changes: 19 additions & 4 deletions tests/unit/common/test_debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,20 +207,35 @@ def test_watcher_level_multiple_watchers(

custom_log_out = io.StringIO()


@pytest.mark.parametrize(
("default_out", "out", "expected_out"),
(
(None, None, sys.stderr),
(sys.stdout, None, sys.stdout),
(sys.stdout, sys.stderr, sys.stderr),
(sys.stderr, sys.stdout, sys.stdout),
(None, None, "stderr"),
("stdout", None, "stdout"),
("stdout", "stderr", "stderr"),
("stderr", "stdout", "stdout"),
(custom_log_out, None, custom_log_out),
(None, custom_log_out, custom_log_out),
)
)
def test_watcher_out(
logger_mocker, default_out, out, expected_out
) -> None:
def normalize_stream(stream):
# For some reason (probably a change in pytest), sys.stdout and
# sys.stderr are replaced with a custom io.TextIOWrapper.
# Therefore, we grab them dynamically within the test.
if isinstance(stream, str):
if stream == "stdout":
return sys.stdout
elif stream == "stderr":
return sys.stderr
return stream

default_out = normalize_stream(default_out)
out = normalize_stream(out)
expected_out = normalize_stream(expected_out)
logger_name = "neo4j"
logger = logger_mocker(logger_name)[0]
kwargs = {}
Expand Down