ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-25 05:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more-robust tests

Browse Source
This commit is contained in:
meejah 2018-04-26 16:20:07 -06:00
parent 2cd74dbb3a
commit e719a3b4d6
1 changed files with 7 additions and 4 deletions

11
integration/test_magic_folder.py

@ -267,15 +267,18 @@ def _bob_conflicts_alice_await_conflicts(name, alice_dir, bob_dir):
join(alice_dir, '{}.conflict'.format(name)),
],
await_all=True,
timeout=30,
)
assert len(found) == 2, "both sides should conflict"
assert len(found) >= 1, "should be at least one conflict"
assert open(join(bob_dir, name), 'r').read() == "this is bob's {}\n".format(name)
assert open(join(alice_dir, name), 'r').read() == "this is alice's {}\n".format(name)
assert open(join(bob_dir, '{}.conflict'.format(name)), 'r').read() == "this is alice's {}\n".format(name)
assert open(join(alice_dir, '{}.conflict'.format(name)), 'r').read() == "this is bob's {}\n".format(name)
alice_conflict = join(alice_dir, '{}.conflict'.format(name))
bob_conflict = join(bob_dir, '{}.conflict'.format(name))
if exists(bob_conflict):
assert open(bob_conflict, 'r').read() == "this is alice's {}\n".format(name)
if exists(alice_conflict):
assert open(alice_conflict, 'r').read() == "this is bob's {}\n".format(name)
@pytest.inlineCallbacks