ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-19 07:48:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

longer timeouts for windows' benefit

Browse Source
This commit is contained in:
meejah
2016-09-15 10:40:46 -07:00
committed by Brian Warner
parent 52e4bf0503
commit ffdf4bf878
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
integration/test_smoke.py
View File

@ -114,9 +114,6 @@ def test_bob_creates_alice_deletes_bob_restores(magic_folder):
"bob wrote this again, because reasons", "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): def test_bob_creates_alice_deletes_alice_restores(magic_folder):
alice_dir, bob_dir = magic_folder alice_dir, bob_dir = magic_folder

2
integration/util.py
View File

@ -2,7 +2,7 @@ import time
from os.path import exists 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() start_time = time.time()
while time.time() - start_time < timeout: while time.time() - start_time < timeout:
print(" waiting for '{}'".format(path)) print(" waiting for '{}'".format(path))