From ea0e6baf71227154e875542f935db0172768f3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radoslav=20Bod=C3=B3?= <bodik@cesnet.cz>
Date: Mon, 15 Apr 2024 11:44:50 +0200
Subject: [PATCH] tests: cleanup fixtures usage
---
tests/test_rwm.py | 6 +++---
tests/test_storage.py | 11 ++---------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/tests/test_rwm.py b/tests/test_rwm.py
index a91b582..ac2165a 100644
--- a/tests/test_rwm.py
+++ b/tests/test_rwm.py
@@ -236,7 +236,7 @@ def test_backup_error_handling(tmpworkdir: str): # pylint: disable=unused-argum
assert rwm.RWM(rwm_conf).backup("dummycfg") == 11
-def test_storage_create(tmpworkdir: str, microceph: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
+def test_storage_create(tmpworkdir: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
"""test_storage_create"""
trwm = rwm.RWM({
@@ -251,7 +251,7 @@ def test_storage_create(tmpworkdir: str, microceph: str, radosuser_admin: rwm.St
trwm.storage_create(bucket_name, "")
-def test_storage_delete(tmpworkdir: str, microceph: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
+def test_storage_delete(tmpworkdir: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
"""test_storage_delete"""
trwm = rwm.RWM({
@@ -297,7 +297,7 @@ def test_storage_list(tmpworkdir: str): # pylint: disable=unused-argument
assert trwm.storage_list() == 0
-def test_storage_info(tmpworkdir: str, microceph: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
+def test_storage_info(tmpworkdir: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
"""test storage_list"""
trwm = rwm.RWM({
diff --git a/tests/test_storage.py b/tests/test_storage.py
index e5abe78..3e08529 100644
--- a/tests/test_storage.py
+++ b/tests/test_storage.py
@@ -13,7 +13,6 @@ import rwm
def test_microceph_defaults(
tmpworkdir: str,
- microceph: str,
radosuser_test1: rwm.StorageManager,
radosuser_test2: rwm.StorageManager
): # pylint: disable=unused-argument
@@ -41,7 +40,6 @@ def test_microceph_defaults(
def test_storage_create(
tmpworkdir: str,
- microceph: str,
radosuser_admin: rwm.StorageManager,
radosuser_test1: rwm.StorageManager,
radosuser_test2: rwm.StorageManager
@@ -62,7 +60,6 @@ def test_storage_create(
def test_storage_object_versioning(
tmpworkdir: str,
- microceph: str,
radosuser_admin: rwm.StorageManager,
radosuser_test1: rwm.StorageManager,
): # pylint: disable=unused-argument
@@ -93,7 +90,6 @@ def test_storage_object_versioning(
def test_storage_check_policy(
tmpworkdir: str,
- microceph: str,
radosuser_admin: rwm.StorageManager,
radosuser_test1: rwm.StorageManager
): # pylint: disable=unused-argument
@@ -118,7 +114,6 @@ def test_storage_check_policy(
def test_storage_backup_usage(
tmpworkdir: str,
- microceph: str,
radosuser_admin: rwm.StorageManager,
radosuser_test1: rwm.StorageManager,
): # pylint: disable=unused-argument
@@ -153,7 +148,6 @@ def test_storage_backup_usage(
def test_storage_list(
tmpworkdir: str,
- microceph: str,
radosuser_admin: rwm.StorageManager,
): # pylint: disable=unused-argument
"""test managet list storage"""
@@ -168,7 +162,6 @@ def test_storage_list(
def test_storage_info(
tmpworkdir: str,
- microceph: str,
radosuser_admin: rwm.StorageManager,
): # pylint: disable=unused-argument
"""test managet list storage"""
@@ -184,7 +177,7 @@ def test_storage_info(
assert radosuser_admin.storage_info(bucket_name)["delete_markers"] == 1
-def test_storage_drop_versions(tmpworkdir: str, microceph: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
+def test_storage_drop_versions(tmpworkdir: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
"""test manager storage_drop_versions"""
bucket_name = "testbuckx"
@@ -211,7 +204,7 @@ def test_storage_drop_versions(tmpworkdir: str, microceph: str, radosuser_admin:
@pytest.mark.skipif('PYTEST_SLOW' not in os.environ, reason='slow on devnode, runs in CI')
-def test_storage_drop_versions_many(tmpworkdir: str, microceph: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
+def test_storage_drop_versions_many(tmpworkdir: str, radosuser_admin: rwm.StorageManager): # pylint: disable=unused-argument
"""test manager storage_drop_versions"""
bucket_name = "testbuckx"
--
GitLab