diff --git a/test/integration/command/download/test_download_patterns.py b/test/integration/command/download/test_download_patterns.py index d2d74985b4c..833134dee01 100644 --- a/test/integration/command/download/test_download_patterns.py +++ b/test/integration/command/download/test_download_patterns.py @@ -10,8 +10,8 @@ @pytest.mark.artifactory_ready class TestDownloadPatterns: # The fixture is very similar from TestUploadPatterns, but not worth extracting - @classmethod @pytest.fixture(scope="class") + @classmethod def client(cls): """ create a few packages, with several recipe revisions, several pids, several prevs """ @@ -142,8 +142,8 @@ def test_pkg_query(self, client): class TestDownloadPatterErrors: - @classmethod @pytest.fixture(scope="class") + @classmethod def client(cls): client = TestClient(default_server_user=True) client.save({"conanfile.py": GenConanfile("pkg", "0.1")}) diff --git a/test/integration/graph/core/test_build_require_invalid.py b/test/integration/graph/core/test_build_require_invalid.py index c2f967e3b72..db2fea2d363 100644 --- a/test/integration/graph/core/test_build_require_invalid.py +++ b/test/integration/graph/core/test_build_require_invalid.py @@ -24,8 +24,8 @@ def validate(self): linux_package_id = "9a4eb3c8701508aa9458b1a73d0633783ecc2270" invalid = "Invalid" - @classmethod @pytest.fixture(scope="class") + @classmethod def client(cls): client = TestClient() client.save({"pkg/conanfile.py": cls.conanfile}) @@ -134,8 +134,8 @@ def package_id(self): linux_package_id = NO_SETTINGS_PACKAGE_ID windows_package_id = NO_SETTINGS_PACKAGE_ID - @classmethod @pytest.fixture(scope="class") + @classmethod def client(cls): client = TestClient() client.save({"pkg/conanfile.py": cls.conanfile}) diff --git a/test/integration/remote/rest_api_test.py b/test/integration/remote/rest_api_test.py index a9d0ac7306b..37bca0ff467 100644 --- a/test/integration/remote/rest_api_test.py +++ b/test/integration/remote/rest_api_test.py @@ -20,8 +20,8 @@ class TestRestApi: """Open a real server (sockets) to test rest_api function.""" - @classmethod @pytest.fixture(scope="class", autouse=True) + @classmethod def setup_class(cls): with environment_update({"CONAN_SERVER_PORT": str(get_free_port())}): read_perms = [("*/*@*/*", "private_user")] diff --git a/test/integration/remote/test_local_recipes_index.py b/test/integration/remote/test_local_recipes_index.py index 847cce28ea9..41b8b62954d 100644 --- a/test/integration/remote/test_local_recipes_index.py +++ b/test/integration/remote/test_local_recipes_index.py @@ -403,8 +403,8 @@ def test_errors_missing_folder(self): class TestPythonRequires: - @classmethod @pytest.fixture(scope="class") + @classmethod def c3i_pyrequires_folder(cls): folder = temp_folder() recipes_folder = os.path.join(folder, "recipes") @@ -433,8 +433,8 @@ def test_install(self, c3i_pyrequires_folder): class TestUserChannel: - @classmethod @pytest.fixture(scope="class") + @classmethod def c3i_user_channel_folder(cls): folder = temp_folder() recipes_folder = os.path.join(folder, "recipes")