diff --git a/src/borg/testsuite/archive.py b/src/borg/testsuite/archive.py index 3dbd21a82..0df979d40 100644 --- a/src/borg/testsuite/archive.py +++ b/src/borg/testsuite/archive.py @@ -259,6 +259,7 @@ def test_invalid_msgpacked_item(packed, item_keys_serialized): OrderedDict((k, b"x" * 1000) for k in IK), # as big (key count and volume) as it gets ] ], + ids=["minimal", "empty-values", "long-values"], ) def test_valid_msgpacked_items(packed, item_keys_serialized): assert valid_msgpacked_dict(packed, item_keys_serialized) diff --git a/src/borg/testsuite/archiver/help_cmd.py b/src/borg/testsuite/archiver/help_cmd.py index f18f0c834..111b11fb7 100644 --- a/src/borg/testsuite/archiver/help_cmd.py +++ b/src/borg/testsuite/archiver/help_cmd.py @@ -51,6 +51,7 @@ def test_help_formatting(command, parser): assert parser.epilog.rst -@pytest.mark.parametrize("topic, helptext", list(Archiver.helptext.items())) -def test_help_formatting_helptexts(topic, helptext): +@pytest.mark.parametrize("topic", list(Archiver.helptext.keys())) +def test_help_formatting_helptexts(topic): + helptext = Archiver.helptext[topic] assert str(rst_to_terminal(helptext)) diff --git a/src/borg/testsuite/cache.py b/src/borg/testsuite/cache.py index f97b6e504..5f0737f9e 100644 --- a/src/borg/testsuite/cache.py +++ b/src/borg/testsuite/cache.py @@ -74,6 +74,7 @@ def test_multiple(self, index, sync): (False, "Unexpected object: false"), (None, "Unexpected object: nil"), ), + ids=["map", "bytes", "int", "double", "true", "false", "none"], ) @pytest.mark.parametrize( "structure", diff --git a/src/borg/testsuite/key.py b/src/borg/testsuite/key.py index 5f1d0ed58..f0245af34 100644 --- a/src/borg/testsuite/key.py +++ b/src/borg/testsuite/key.py @@ -315,7 +315,11 @@ def test_invalid(self, key, tam, exc): with pytest.raises(exc): key.unpack_and_verify_manifest(blob) - @pytest.mark.parametrize("hmac, salt", (({}, bytes(64)), (bytes(64), {}), (None, bytes(64)), (bytes(64), None))) + @pytest.mark.parametrize( + "hmac, salt", + (({}, bytes(64)), (bytes(64), {}), (None, bytes(64)), (bytes(64), None)), + ids=["ed-b64", "b64-ed", "n-b64", "b64-n"], + ) def test_wrong_types(self, key, hmac, salt): data = {"tam": {"type": "HKDF_HMAC_SHA512", "hmac": hmac, "salt": salt}} tam = data["tam"]