Skip to content
Draft
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
9 changes: 3 additions & 6 deletions python/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,24 +385,21 @@ def mock_s3_storage_with_error_simulation(mock_s3_storage_with_error_simulation_
@pytest.fixture(scope="session")
def real_s3_storage_factory() -> BaseS3StorageFixtureFactory:
return real_s3_from_environment_variables(
shared_path=False,
additional_suffix=f"{random.randint(0, 999)}_{datetime.utcnow().strftime('%Y-%m-%dT%H_%M_%S_%f')}",
shared_path=False
)


@pytest.fixture(scope="session")
def real_gcp_storage_factory() -> BaseGCPStorageFixtureFactory:
return real_gcp_from_environment_variables(
shared_path=False,
additional_suffix=f"{random.randint(0, 999)}_{datetime.utcnow().strftime('%Y-%m-%dT%H_%M_%S_%f')}",
shared_path=False
)


@pytest.fixture(scope="session")
def real_azure_storage_factory() -> AzureStorageFixtureFactory:
return real_azure_from_environment_variables(
shared_path=False,
additional_suffix=f"{random.randint(0, 999)}_{datetime.utcnow().strftime('%Y-%m-%dT%H_%M_%S_%f')}",
shared_path=False
)


Expand Down
3 changes: 2 additions & 1 deletion python/tests/util/storage_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import argparse
import re
from datetime import datetime
import ssl

from arcticdb import Arctic
from arcticc.pb2.s3_storage_pb2 import Config as S3Config
Expand Down Expand Up @@ -170,7 +171,7 @@ def find_ca_certs():
### there is no way how arcticdb 3.0 could have had the functions that we are going to implement
### and support from now on
def get_real_azure_uri(shared_path: bool = True):
container, constr, path_prefix = real_azure_credentials(shared_path)
container, constr, path_prefix, _ = real_azure_credentials(shared_path)
ca_certs_file = find_ca_certs()
uri = f"azure://Container={container};Path_prefix={path_prefix}"
assert ca_certs_file, f"CA file: {ca_certs_file} not found!"
Expand Down
Loading