Skip to content
Snippets Groups Projects
Commit ea0e6baf authored by Radoslav Bodó's avatar Radoslav Bodó
Browse files

tests: cleanup fixtures usage

parent f5dcc1f7
No related branches found
No related tags found
No related merge requests found
...@@ -236,7 +236,7 @@ def test_backup_error_handling(tmpworkdir: str): # pylint: disable=unused-argum ...@@ -236,7 +236,7 @@ def test_backup_error_handling(tmpworkdir: str): # pylint: disable=unused-argum
assert rwm.RWM(rwm_conf).backup("dummycfg") == 11 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""" """test_storage_create"""
trwm = rwm.RWM({ trwm = rwm.RWM({
...@@ -251,7 +251,7 @@ def test_storage_create(tmpworkdir: str, microceph: str, radosuser_admin: rwm.St ...@@ -251,7 +251,7 @@ def test_storage_create(tmpworkdir: str, microceph: str, radosuser_admin: rwm.St
trwm.storage_create(bucket_name, "") 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""" """test_storage_delete"""
trwm = rwm.RWM({ trwm = rwm.RWM({
...@@ -297,7 +297,7 @@ def test_storage_list(tmpworkdir: str): # pylint: disable=unused-argument ...@@ -297,7 +297,7 @@ def test_storage_list(tmpworkdir: str): # pylint: disable=unused-argument
assert trwm.storage_list() == 0 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""" """test storage_list"""
trwm = rwm.RWM({ trwm = rwm.RWM({
......
...@@ -13,7 +13,6 @@ import rwm ...@@ -13,7 +13,6 @@ import rwm
def test_microceph_defaults( def test_microceph_defaults(
tmpworkdir: str, tmpworkdir: str,
microceph: str,
radosuser_test1: rwm.StorageManager, radosuser_test1: rwm.StorageManager,
radosuser_test2: rwm.StorageManager radosuser_test2: rwm.StorageManager
): # pylint: disable=unused-argument ): # pylint: disable=unused-argument
...@@ -41,7 +40,6 @@ def test_microceph_defaults( ...@@ -41,7 +40,6 @@ def test_microceph_defaults(
def test_storage_create( def test_storage_create(
tmpworkdir: str, tmpworkdir: str,
microceph: str,
radosuser_admin: rwm.StorageManager, radosuser_admin: rwm.StorageManager,
radosuser_test1: rwm.StorageManager, radosuser_test1: rwm.StorageManager,
radosuser_test2: rwm.StorageManager radosuser_test2: rwm.StorageManager
...@@ -62,7 +60,6 @@ def test_storage_create( ...@@ -62,7 +60,6 @@ def test_storage_create(
def test_storage_object_versioning( def test_storage_object_versioning(
tmpworkdir: str, tmpworkdir: str,
microceph: str,
radosuser_admin: rwm.StorageManager, radosuser_admin: rwm.StorageManager,
radosuser_test1: rwm.StorageManager, radosuser_test1: rwm.StorageManager,
): # pylint: disable=unused-argument ): # pylint: disable=unused-argument
...@@ -93,7 +90,6 @@ def test_storage_object_versioning( ...@@ -93,7 +90,6 @@ def test_storage_object_versioning(
def test_storage_check_policy( def test_storage_check_policy(
tmpworkdir: str, tmpworkdir: str,
microceph: str,
radosuser_admin: rwm.StorageManager, radosuser_admin: rwm.StorageManager,
radosuser_test1: rwm.StorageManager radosuser_test1: rwm.StorageManager
): # pylint: disable=unused-argument ): # pylint: disable=unused-argument
...@@ -118,7 +114,6 @@ def test_storage_check_policy( ...@@ -118,7 +114,6 @@ def test_storage_check_policy(
def test_storage_backup_usage( def test_storage_backup_usage(
tmpworkdir: str, tmpworkdir: str,
microceph: str,
radosuser_admin: rwm.StorageManager, radosuser_admin: rwm.StorageManager,
radosuser_test1: rwm.StorageManager, radosuser_test1: rwm.StorageManager,
): # pylint: disable=unused-argument ): # pylint: disable=unused-argument
...@@ -153,7 +148,6 @@ def test_storage_backup_usage( ...@@ -153,7 +148,6 @@ def test_storage_backup_usage(
def test_storage_list( def test_storage_list(
tmpworkdir: str, tmpworkdir: str,
microceph: str,
radosuser_admin: rwm.StorageManager, radosuser_admin: rwm.StorageManager,
): # pylint: disable=unused-argument ): # pylint: disable=unused-argument
"""test managet list storage""" """test managet list storage"""
...@@ -168,7 +162,6 @@ def test_storage_list( ...@@ -168,7 +162,6 @@ def test_storage_list(
def test_storage_info( def test_storage_info(
tmpworkdir: str, tmpworkdir: str,
microceph: str,
radosuser_admin: rwm.StorageManager, radosuser_admin: rwm.StorageManager,
): # pylint: disable=unused-argument ): # pylint: disable=unused-argument
"""test managet list storage""" """test managet list storage"""
...@@ -184,7 +177,7 @@ def test_storage_info( ...@@ -184,7 +177,7 @@ def test_storage_info(
assert radosuser_admin.storage_info(bucket_name)["delete_markers"] == 1 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""" """test manager storage_drop_versions"""
bucket_name = "testbuckx" bucket_name = "testbuckx"
...@@ -211,7 +204,7 @@ def test_storage_drop_versions(tmpworkdir: str, microceph: str, radosuser_admin: ...@@ -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') @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""" """test manager storage_drop_versions"""
bucket_name = "testbuckx" bucket_name = "testbuckx"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment