bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test/object_store: Parametrize test_simple_backup_and_restore()

Browse Source 
There are three tests and a function with a pair of boolean parameters
called by those. It's less code if the function becomes a test with
parameters.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>

Closes scylladb/scylladb#28677
This commit is contained in:
Pavel Emelyanov
2026-02-17 13:42:17 +03:00
committed by Botond Dénes
parent a2e1293f86
commit a4a0d75eee
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/cluster/object_store/test_backup.py
View File

@@ -239,7 +239,9 @@ async def test_backup_is_abortable_in_s3_client(manager: ManagerClient, object_s
await do_test_backup_abort(manager, object_storage, breakpoint_name="backup_task_pre_upload", min_files=0, max_files=1)
async def do_test_simple_backup_and_restore(manager: ManagerClient, object_storage, tmpdir, do_encrypt = False, do_abort = False):
@pytest.mark.asyncio
@pytest.mark.parametrize(("do_encrypt", "do_abort"), [(False, False), (False, True), (True, False)])
async def test_simple_backup_and_restore(manager: ManagerClient, object_storage, tmpdir, do_encrypt, do_abort):
'''check that restoring from backed up snapshot for a keyspace:table works'''
objconf = object_storage.create_endpoint_conf()
@@ -351,17 +353,6 @@ async def do_test_simple_backup_and_restore(manager: ManagerClient, object_stora
post_objects = set(o.key for o in object_storage.get_resource().Bucket(object_storage.bucket_name).objects.filter(Prefix=prefix))
assert objects == post_objects
@pytest.mark.asyncio
async def test_simple_backup_and_restore(manager: ManagerClient, object_storage, tmp_path):
'''check that restoring from backed up snapshot for a keyspace:table works'''
await do_test_simple_backup_and_restore(manager, object_storage, tmp_path, False, False)
@pytest.mark.asyncio
async def test_abort_simple_backup_and_restore(manager: ManagerClient, object_storage, tmp_path):
'''check that restoring from backed up snapshot for a keyspace:table works'''
await do_test_simple_backup_and_restore(manager, object_storage, tmp_path, False, True)
async def do_abort_restore(manager: ManagerClient, object_storage):
# Define configuration for the servers.
@@ -485,12 +476,6 @@ async def test_abort_restore_with_rpc_error(manager: ManagerClient, object_stora
await do_abort_restore(manager, object_storage)
@pytest.mark.asyncio
async def test_simple_backup_and_restore_with_encryption(manager: ManagerClient, object_storage, tmp_path):
'''check that restoring from backed up snapshot for a keyspace:table works'''
await do_test_simple_backup_and_restore(manager, object_storage, tmp_path, True, False)
# Helper class to parametrize the test below
class topo:
def __init__(self, rf, nodes, racks, dcs):