From 0d74f5ed428da15b978a4a11dbc9f9ee5b43c162 Mon Sep 17 00:00:00 2001 From: LN Liberda Date: Mon, 12 Jan 2026 21:31:13 +0100 Subject: [PATCH] Move pytest_plugins to top-level conftest https://docs.pytest.org/en/stable/deprecations.html#pytest-plugins-in-non-top-level-conftest-files --- changelog.d/+pytest-9.0.infrastructure.md | 1 + test/conftest.py | 2 ++ test/integration/conftest.py | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 changelog.d/+pytest-9.0.infrastructure.md diff --git a/changelog.d/+pytest-9.0.infrastructure.md b/changelog.d/+pytest-9.0.infrastructure.md new file mode 100644 index 000000000..01a4c3d47 --- /dev/null +++ b/changelog.d/+pytest-9.0.infrastructure.md @@ -0,0 +1 @@ +Fix tests with pytest 9.0. \ No newline at end of file diff --git a/test/conftest.py b/test/conftest.py index 8f0629b9c..6b5f2de8c 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -12,6 +12,8 @@ import pytest +pytest_plugins = ['b2sdk.v3.testing'] + @pytest.hookimpl def pytest_configure(config): diff --git a/test/integration/conftest.py b/test/integration/conftest.py index 1a7226d33..035a2beda 100755 --- a/test/integration/conftest.py +++ b/test/integration/conftest.py @@ -47,9 +47,6 @@ GENERAL_BUCKET_NAME_PREFIX = 'clitst' -pytest_plugins = ['b2sdk.v3.testing'] - - @pytest.fixture(scope='session', autouse=True) def summary_notes(request, worker_id): capmanager = request.config.pluginmanager.getplugin('capturemanager')