mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-04-27 14:57:41 +00:00
Normalise pytest syntax
This commit is contained in:
parent
aab70e9fb0
commit
a4d4bf8fd1
6 changed files with 7 additions and 7 deletions
|
|
@ -40,7 +40,7 @@ class TestCalDAVStorage(DAVStorageTests):
|
||||||
# The `arg` param is not named `item_types` because that would hit
|
# The `arg` param is not named `item_types` because that would hit
|
||||||
# https://bitbucket.org/pytest-dev/pytest/issue/745/
|
# https://bitbucket.org/pytest-dev/pytest/issue/745/
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"arg,calls_num",
|
("arg", "calls_num"),
|
||||||
[
|
[
|
||||||
(("VTODO",), 1),
|
(("VTODO",), 1),
|
||||||
(("VEVENT",), 1),
|
(("VEVENT",), 1),
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ def test_null_collection_with_named_collection(tmpdir, runner):
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"a_requires,b_requires",
|
("a_requires", "b_requires"),
|
||||||
[
|
[
|
||||||
(True, True),
|
(True, True),
|
||||||
(True, False),
|
(True, False),
|
||||||
|
|
|
||||||
|
|
@ -358,7 +358,7 @@ def test_ident_conflict(tmpdir, runner):
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"existing,missing",
|
("existing", "missing"),
|
||||||
[
|
[
|
||||||
("foo", "bar"),
|
("foo", "bar"),
|
||||||
("bar", "foo"),
|
("bar", "foo"),
|
||||||
|
|
@ -402,7 +402,7 @@ def test_no_configured_pairs(tmpdir, runner, cmd):
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"resolution,expect_foo,expect_bar",
|
("resolution", "expect_foo", "expect_bar"),
|
||||||
[(["command", "cp"], "UID:lol\nfööcontent", "UID:lol\nfööcontent")],
|
[(["command", "cp"], "UID:lol\nfööcontent", "UID:lol\nfööcontent")],
|
||||||
)
|
)
|
||||||
def test_conflict_resolution(tmpdir, runner, resolution, expect_foo, expect_bar):
|
def test_conflict_resolution(tmpdir, runner, resolution, expect_foo, expect_bar):
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ missing = object()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"shortcuts,expected",
|
("shortcuts", "expected"),
|
||||||
[
|
[
|
||||||
(
|
(
|
||||||
["from a"],
|
["from a"],
|
||||||
|
|
|
||||||
|
|
@ -437,7 +437,7 @@ async def test_partial_sync_revert():
|
||||||
assert items(a) == {"UID:2"}
|
assert items(a) == {"UID:2"}
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("sync_inbetween", (True, False))
|
@pytest.mark.parametrize("sync_inbetween", [True, False])
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_ident_conflict(sync_inbetween):
|
async def test_ident_conflict(sync_inbetween):
|
||||||
a = MemoryStorage()
|
a = MemoryStorage()
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ async def test_repair_unsafe_uids(uid):
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@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):
|
def test_repair_unsafe_href(uid, href):
|
||||||
item = Item(f"BEGIN:VCARD\nUID:{uid}\nEND:VCARD")
|
item = Item(f"BEGIN:VCARD\nUID:{uid}\nEND:VCARD")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue