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

unify tests

Browse Source
This commit is contained in:
meejah
2018-04-24 18:07:22 -06:00
parent 21c6825172
commit c5a20127a1
1 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
integration/test_magic_folder.py
View File

@ -226,29 +226,12 @@ def test_bob_conflicts_with_alice_fresh(magic_folder):
alice_dir, bob_dir = magic_folder alice_dir, bob_dir = magic_folder
# either alice or bob will "win" by uploading to the DMD first. # either alice or bob will "win" by uploading to the DMD first.
with open(join(bob_dir, 'alpha'), 'w') as f: with open(join(bob_dir, 'alpha'), 'w') as f0, open(join(alice_dir, 'alpha'), 'w') as f1:
f.write("this is bob's alpha\n") f0.write("this is bob's alpha\n")
with open(join(alice_dir, 'alpha'), 'w') as f: f1.write("this is alice's alpha\n")
f.write("this is alice's alpha\n")
# there should be a conflict, but we don't know who will win the # there should be conflicts
# race _bob_conflicts_alice_await_conflicts('alpha', alice_dir, bob_dir)
found = util.await_files_exist([
join(bob_dir, 'alpha.conflict'),
join(alice_dir, 'alpha.conflict'),
])
assert len(found) >= 1, "at least one side should conflict"
assert open(join(bob_dir, 'alpha'), 'r').read() == "this is bob's alpha\n"
assert open(join(alice_dir, 'alpha'), 'r').read() == "this is alice's alpha\n"
bob_conflict = join(bob_dir, 'alpha.conflict')
if exists(bob_conflict):
assert open(bob_conflict, 'r').read() == "this is alice's alpha\n"
alice_conflict = join(alice_dir, 'alpha.conflict')
if exists(alice_conflict):
assert open(alice_conflict, 'r').read() == "this is bob's alpha\n"
def test_bob_conflicts_with_alice_preexisting(magic_folder): def test_bob_conflicts_with_alice_preexisting(magic_folder):
@ -271,20 +254,28 @@ def test_bob_conflicts_with_alice_preexisting(magic_folder):
f.write("this is alice's beta\n") f.write("this is alice's beta\n")
# both alice and bob should see a conflict # both alice and bob should see a conflict
acceptable = [ _bob_conflicts_alice_await_conflicts("beta", alice_dir, bob_dir)
join(bob_dir, 'beta.conflict'),
join(alice_dir, 'beta.conflict'),
]
found = util.await_files_exist(acceptable)
assert len(found) >= 1, "should have found at least one conflict"
assert open(join(bob_dir, 'beta'), 'r').read() == "this is bob's beta\n" def _bob_conflicts_alice_await_conflicts(name, alice_dir, bob_dir):
assert open(join(alice_dir, 'beta'), 'r').read() == "this is alice's beta\n" """
if exists(join(bob_dir, 'beta.conflict')): shared code between _fresh and _preexisting conflict test
assert open(join(bob_dir, 'beta.conflict'), 'r').read() == "this is alice's beta\n" """
if exists(join(alice_dir, 'beta.conflict')): found = util.await_files_exist(
assert open(join(alice_dir, 'beta.conflict'), 'r').read() == "this is bob's beta\n" [
join(bob_dir, '{}.conflict'.format(name)),
join(alice_dir, '{}.conflict'.format(name)),
],
await_all=True,
timeout=30,
)
assert len(found) == 2, "both sides should 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)
@pytest.inlineCallbacks @pytest.inlineCallbacks