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
4 changes: 2 additions & 2 deletions test/integration/command/download/test_download_patterns.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""
Expand Down Expand Up @@ -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")})
Expand Down
4 changes: 2 additions & 2 deletions test/integration/graph/core/test_build_require_invalid.py
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion test/integration/remote/rest_api_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
4 changes: 2 additions & 2 deletions test/integration/remote/test_local_recipes_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
Loading