ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 05:28:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #494 from meejah/2909.reliable-test.0

Browse Source 
Fix Magic Folder integration test.

Previously it waited for 2 conflicting files but there's no guarantee both sides will conflict in this scenario.  The test should be satisfied with at least one side conflicting (and the assertions it makes already are).
This commit is contained in:
Jean-Paul Calderone 2018-05-16 07:56:56 -04:00 committed by GitHub
commit 91c655298a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
integration/test_magic_folder.py
View File

@ -266,7 +266,6 @@ def _bob_conflicts_alice_await_conflicts(name, alice_dir, bob_dir):
join(bob_dir, '{}.conflict'.format(name)),
join(alice_dir, '{}.conflict'.format(name)),
],
await_all=True,
)
assert len(found) >= 1, "should be at least one conflict"