Skip to content

Commit

Permalink
Skip s3 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
muhammadhamzasajjad committed Apr 23, 2024
1 parent 2c022c7 commit f3b70de
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
14 changes: 10 additions & 4 deletions python/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
AZURE_TESTS_MARK,
MONGO_TESTS_MARK,
REAL_S3_TESTS_MARK,
S3_TESTS_MARK,
S3_SSL_TEST_ENABLED,
)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions python/tests/util/mark.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
Expand Down

0 comments on commit f3b70de

Please sign in to comment.