From ffdf4bf8782bc8370d69524a47a03c7c97adfe16 Mon Sep 17 00:00:00 2001 From: meejah Date: Thu, 15 Sep 2016 10:40:46 -0700 Subject: [PATCH] longer timeouts for windows' benefit --- integration/test_smoke.py | 3 --- integration/util.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/integration/test_smoke.py b/integration/test_smoke.py index 459f874d2..88203ef48 100644 --- a/integration/test_smoke.py +++ b/integration/test_smoke.py @@ -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 diff --git a/integration/util.py b/integration/util.py index 038ea0e6e..d2e019a1c 100644 --- a/integration/util.py +++ b/integration/util.py @@ -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))