mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-18 10:46:24 +00:00
Merge branch '2916.grid-manager-integration-tests.2' of https://github.com/tahoe-lafs/tahoe-lafs into 2916.grid-manager-integration-tests.2
This commit is contained in:
commit
34641846ab
@ -214,6 +214,9 @@ def test_reject_storage_server(reactor, request, temp_dir, flog_gatherer, port_a
|
||||
# re-start this storage server
|
||||
yield storage0.restart(reactor, request)
|
||||
|
||||
import time
|
||||
time.sleep(1)
|
||||
|
||||
# now only one storage-server has the certificate .. configure
|
||||
# diana to have the grid-manager certificate
|
||||
|
||||
@ -231,6 +234,8 @@ def test_reject_storage_server(reactor, request, temp_dir, flog_gatherer, port_a
|
||||
# diana has happy=2 but should only find storage0 to be acceptable
|
||||
# to upload to)
|
||||
|
||||
# Takes a little bit of time for node to connect:
|
||||
for i in range(10):
|
||||
try:
|
||||
yield util.run_tahoe(
|
||||
reactor, request, "--node-directory", diana.process.node_dir,
|
||||
@ -239,7 +244,12 @@ def test_reject_storage_server(reactor, request, temp_dir, flog_gatherer, port_a
|
||||
)
|
||||
assert False, "Should get a failure"
|
||||
except util.ProcessFailed as e:
|
||||
assert b'UploadUnhappinessError' in e.output
|
||||
if b'UploadUnhappinessError' in e.output:
|
||||
# We're done! We've succeeded.
|
||||
return
|
||||
time.sleep(0.2)
|
||||
|
||||
assert False, "Failed to see one of out of two servers"
|
||||
|
||||
|
||||
@pytest_twisted.inlineCallbacks
|
||||
|
Loading…
Reference in New Issue
Block a user