From 4bdb1e33a8eb620f53420219d439421da135262f Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 30 Nov 2016 16:47:45 +0100 Subject: Increase merge timeouts. --- tools/testcase1.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/testcase1.py') diff --git a/tools/testcase1.py b/tools/testcase1.py index dbd143a..dc6e004 100755 --- a/tools/testcase1.py +++ b/tools/testcase1.py @@ -24,7 +24,7 @@ testdir = sys.argv[4] if len(sys.argv) > 5 and sys.argv[5] == '--nomerge': do_merge = False - TREESIZE_TIMEOUT = 25 + TREESIZE_TIMEOUT = 40 else: do_merge = True TREESIZE_TIMEOUT = 0 @@ -172,8 +172,8 @@ if do_merge: mergeresult = merge() assert_equal(mergeresult, 0, "merge", quiet=True, fatal=True) else: - print "sleeping 15 seconds waiting for first merge" - sleep(15) + print "sleeping 25 seconds waiting for first merge" + sleep(25) for baseurl in baseurls: print_and_check_tree_size(0, baseurl) -- cgit v1.1