diff --git a/tests/storage/dav/test_caldav.py b/tests/storage/dav/test_caldav.py index 37c7576..b0b8859 100644 --- a/tests/storage/dav/test_caldav.py +++ b/tests/storage/dav/test_caldav.py @@ -40,7 +40,7 @@ class TestCalDAVStorage(DAVStorageTests): # The `arg` param is not named `item_types` because that would hit # https://bitbucket.org/pytest-dev/pytest/issue/745/ @pytest.mark.parametrize( - "arg,calls_num", + ("arg", "calls_num"), [ (("VTODO",), 1), (("VEVENT",), 1), diff --git a/tests/system/cli/test_discover.py b/tests/system/cli/test_discover.py index 1bb9f71..f8d5580 100644 --- a/tests/system/cli/test_discover.py +++ b/tests/system/cli/test_discover.py @@ -191,7 +191,7 @@ def test_null_collection_with_named_collection(tmpdir, runner): @pytest.mark.parametrize( - "a_requires,b_requires", + ("a_requires", "b_requires"), [ (True, True), (True, False), diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py index 78b1362..88c656b 100644 --- a/tests/system/cli/test_sync.py +++ b/tests/system/cli/test_sync.py @@ -358,7 +358,7 @@ def test_ident_conflict(tmpdir, runner): @pytest.mark.parametrize( - "existing,missing", + ("existing", "missing"), [ ("foo", "bar"), ("bar", "foo"), @@ -402,7 +402,7 @@ def test_no_configured_pairs(tmpdir, runner, cmd): @pytest.mark.parametrize( - "resolution,expect_foo,expect_bar", + ("resolution", "expect_foo", "expect_bar"), [(["command", "cp"], "UID:lol\nfööcontent", "UID:lol\nfööcontent")], ) def test_conflict_resolution(tmpdir, runner, resolution, expect_foo, expect_bar): diff --git a/tests/unit/cli/test_discover.py b/tests/unit/cli/test_discover.py index fef646e..a396482 100644 --- a/tests/unit/cli/test_discover.py +++ b/tests/unit/cli/test_discover.py @@ -9,7 +9,7 @@ missing = object() @pytest.mark.parametrize( - "shortcuts,expected", + ("shortcuts", "expected"), [ ( ["from a"], diff --git a/tests/unit/sync/test_sync.py b/tests/unit/sync/test_sync.py index 261780d..c6c3101 100644 --- a/tests/unit/sync/test_sync.py +++ b/tests/unit/sync/test_sync.py @@ -437,7 +437,7 @@ async def test_partial_sync_revert(): assert items(a) == {"UID:2"} -@pytest.mark.parametrize("sync_inbetween", (True, False)) +@pytest.mark.parametrize("sync_inbetween", [True, False]) @pytest.mark.asyncio async def test_ident_conflict(sync_inbetween): a = MemoryStorage() diff --git a/tests/unit/test_repair.py b/tests/unit/test_repair.py index 9d1e61e..8f059ff 100644 --- a/tests/unit/test_repair.py +++ b/tests/unit/test_repair.py @@ -58,7 +58,7 @@ async def test_repair_unsafe_uids(uid): @pytest.mark.parametrize( - "uid,href", [("b@dh0mbr3", "perfectly-fine"), ("perfectly-fine", "b@dh0mbr3")] + ("uid", "href"), [("b@dh0mbr3", "perfectly-fine"), ("perfectly-fine", "b@dh0mbr3")] ) def test_repair_unsafe_href(uid, href): item = Item(f"BEGIN:VCARD\nUID:{uid}\nEND:VCARD")