Skip to content

Commit

Permalink
Remove unnecessary and unused fixtures
Browse files Browse the repository at this point in the history
  • Loading branch information
sjperkins committed Nov 13, 2023
1 parent b716137 commit 4ff3f47
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
9 changes: 2 additions & 7 deletions daskms/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,18 +311,13 @@ def minio_server(tmp_path_factory):
server_process.kill()


@pytest.fixture
def minio_alias():
return "testcloud"


@pytest.fixture
def minio_user_key():
return "abcdef1234567890"


@pytest.fixture
def minio_admin(minio_server, minio_alias, minio_user_key):
def minio_admin(minio_server, minio_user_key):
minio = pytest.importorskip("minio")
credentials = pytest.importorskip("minio.credentials")
minio_admin = minio.MinioAdmin(
Expand All @@ -338,7 +333,7 @@ def minio_admin(minio_server, minio_alias, minio_user_key):


@pytest.fixture
def py_minio_client(minio_admin, minio_alias, minio_user_key):
def py_minio_client(minio_admin, minio_user_key):
minio = pytest.importorskip("minio")
parsed_url = urlparse(MINIO_URL)
yield minio.Minio(
Expand Down
4 changes: 0 additions & 4 deletions daskms/tests/test_fsspec_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ def test_store_subtable_access(tmp_path_factory):
def test_minio_server(
tmp_path,
py_minio_client,
minio_admin,
minio_alias,
minio_user_key,
minio_url,
s3_bucket_name,
Expand All @@ -126,8 +124,6 @@ def test_minio_server(
def test_storage_options_from_config(
tmp_path,
py_minio_client,
minio_admin,
minio_alias,
minio_user_key,
minio_url,
s3_bucket_name,
Expand Down

0 comments on commit 4ff3f47

Please sign in to comment.