From 49b6e85963ef55fb6cfa1876fe825730f95658bc Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 25 Nov 2016 00:47:13 +0100
Subject: Parallelise merge_fetch.py.

NOTE: Not supporting permdb yet!

We're still not passing the tests because merge_backup.py exits when
the secondary merge disappears.
---
 tools/testcase1.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/testcase1.py')

diff --git a/tools/testcase1.py b/tools/testcase1.py
index 98b9179..885c24d 100755
--- a/tools/testcase1.py
+++ b/tools/testcase1.py
@@ -156,7 +156,7 @@ def merge():
         return subprocess.call([toolsdir + "/merge", "--config", testdir + "/catlfish-test.cfg",
                                 "--localconfig", testdir + "/catlfish-test-local-merge.cfg"])
     else:
-        n = 60
+        n = 40
         print "testcase1.py: sleeping", n, "seconds waiting for merge"
         sleep(n)
         return 0
-- 
cgit v1.1