longer timeouts for windows' benefit

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

View File

@ -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

View File

@ -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))