mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-04-13 22:03:04 +00:00
longer timeouts for windows' benefit
This commit is contained in:
parent
52e4bf0503
commit
ffdf4bf878
@ -114,9 +114,6 @@ def test_bob_creates_alice_deletes_bob_restores(magic_folder):
|
||||
"bob wrote this again, because reasons",
|
||||
)
|
||||
|
||||
# fix the conflict
|
||||
shutil.move(join(alice_dir, "boom.conflict"), join(alice_dir, "boom"))
|
||||
|
||||
|
||||
def test_bob_creates_alice_deletes_alice_restores(magic_folder):
|
||||
alice_dir, bob_dir = magic_folder
|
||||
|
@ -2,7 +2,7 @@ import time
|
||||
from os.path import exists
|
||||
|
||||
|
||||
def await_file_contents(path, contents, timeout=10):
|
||||
def await_file_contents(path, contents, timeout=15):
|
||||
start_time = time.time()
|
||||
while time.time() - start_time < timeout:
|
||||
print(" waiting for '{}'".format(path))
|
||||
|
Loading…
x
Reference in New Issue
Block a user