ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-22 06:17:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

more client awaiting

Browse Source
This commit is contained in:
meejah 2019-08-08 21:39:53 -06:00
parent 19e16243d7
commit 84a320db34
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/test_magic_folder.py
View File

@ -340,6 +340,7 @@ def test_edmond_uploads_then_restarts(reactor, request, temp_dir, introducer_fur
yield edmond.transport.exited yield edmond.transport.exited
time.sleep(1) time.sleep(1)
edmond = yield util._run_node(reactor, edmond.node_dir, request, 'Completed initial Magic Folder scan successfully') edmond = yield util._run_node(reactor, edmond.node_dir, request, 'Completed initial Magic Folder scan successfully')
util.await_client_ready(edmond)
# add a thing to the magic-folder # add a thing to the magic-folder
with open(join(magic_folder, "its_a_file"), "w") as f: with open(join(magic_folder, "its_a_file"), "w") as f:
@ -387,6 +388,7 @@ def test_edmond_uploads_then_restarts(reactor, request, temp_dir, introducer_fur
yield edmond.transport.exited yield edmond.transport.exited
time.sleep(1) time.sleep(1)
edmond = yield util._run_node(reactor, edmond.node_dir, request, 'Completed initial Magic Folder scan successfully') edmond = yield util._run_node(reactor, edmond.node_dir, request, 'Completed initial Magic Folder scan successfully')
util.await_client_ready(edmond)
# XXX how can we say for sure if we've waited long enough? look at # XXX how can we say for sure if we've waited long enough? look at
# tail of logs for magic-folder ... somethingsomething? # tail of logs for magic-folder ... somethingsomething?

7
integration/test_servers_of_happiness.py
View File

@ -12,7 +12,7 @@ import pytest_twisted
@pytest_twisted.inlineCallbacks @pytest_twisted.inlineCallbacks
def test_upload_immutable(reactor, temp_dir, introducer_furl, flog_gatherer, storage_nodes, request): def test_upload_immutable(reactor, temp_dir, introducer_furl, flog_gatherer, storage_nodes, request):
yield util._create_node( edna = yield util._create_node(
reactor, request, temp_dir, introducer_furl, flog_gatherer, "edna", reactor, request, temp_dir, introducer_furl, flog_gatherer, "edna",
web_port="tcp:9983:interface=localhost", web_port="tcp:9983:interface=localhost",
storage=False, storage=False,
@ -20,13 +20,10 @@ def test_upload_immutable(reactor, temp_dir, introducer_furl, flog_gatherer, sto
happy=7, happy=7,
total=10, total=10,
) )
util.await_client_ready(edna)
node_dir = join(temp_dir, 'edna') node_dir = join(temp_dir, 'edna')
print("waiting 10 seconds unil we're maybe ready")
yield task.deferLater(reactor, 10, lambda: None)
# upload a file, which should fail because we have don't have 7 # upload a file, which should fail because we have don't have 7
# storage servers (but happiness is set to 7) # storage servers (but happiness is set to 7)
proto = util._CollectOutputProtocol() proto = util._CollectOutputProtocol()