ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

missed merge conflict

Browse Source
This commit is contained in:
meejah 2019-08-10 21:33:02 -06:00
parent 68e408118b
commit 73402605ed
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integration/test_magic_folder.py
View File

@ -387,10 +387,7 @@ def test_edmond_uploads_then_restarts(reactor, request, temp_dir, introducer_fur
yield edmond.transport.exited
time.sleep(1)
edmond = yield util._run_node(reactor, edmond.node_dir, request, 'Completed initial Magic Folder scan successfully')
<<<<<<< HEAD
util.await_client_ready(edmond)
=======
>>>>>>> Instead of abusing the process transport, introduce a new object
# XXX how can we say for sure if we've waited long enough? look at
# tail of logs for magic-folder ... somethingsomething?