diff --git a/python/tests/conftest.py b/python/tests/conftest.py index b687b219f73..50bc7147f40 100644 --- a/python/tests/conftest.py +++ b/python/tests/conftest.py @@ -36,6 +36,7 @@ AZURE_TESTS_MARK, MONGO_TESTS_MARK, REAL_S3_TESTS_MARK, + S3_TESTS_MARK, S3_SSL_TEST_ENABLED, ) @@ -106,19 +107,24 @@ def lmdb_storage(tmp_path): yield f -@pytest.fixture(scope="session") +@pytest.fixture(scope="session", params=[pytest.param(1, marks=S3_TESTS_MARK)]) def s3_storage_factory(): with MotoS3StorageFixtureFactory(use_ssl=S3_SSL_TEST_ENABLED) as f: yield f -@pytest.fixture(scope="session") +@pytest.fixture(scope="session", params=[pytest.param(1, marks=S3_TESTS_MARK)]) def s3_no_ssl_storage_factory(): with MotoS3StorageFixtureFactory(use_ssl=False) as f: yield f -@pytest.fixture +@pytest.fixture( + scope="function", + params=[ + pytest.param("s3_storage_factory", marks=S3_TESTS_MARK), + ], +) def s3_storage(s3_storage_factory): with s3_storage_factory.create_fixture() as f: yield f @@ -197,7 +203,7 @@ def mem_storage(): @pytest.fixture( scope="function", params=[ - "s3", + pytest.param("s3", marks=S3_TESTS_MARK), "lmdb", "mem", pytest.param("azurite", marks=AZURE_TESTS_MARK), diff --git a/python/tests/util/mark.py b/python/tests/util/mark.py index 4b2da35e3ec..5f6a232cced 100644 --- a/python/tests/util/mark.py +++ b/python/tests/util/mark.py @@ -48,6 +48,7 @@ """Mark on tests using the real (i.e. hosted by AWS as opposed to moto) S3. Currently controlled by the ARCTICDB_PERSISTENT_STORAGE_TESTS and ARCTICDB_FAST_TESTS_ONLY env vars.""" +S3_TESTS_MARK = pytest.mark.skip """Windows and MacOS have different handling of self-signed CA cert for test. TODO: https://github.com/man-group/ArcticDB/issues/1394"""