summaryrefslogtreecommitdiff
path: root/tools/testcase1.py
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-01-27 16:35:21 +0100
committerLinus Nordberg <linus@nordu.net>2017-01-30 09:54:08 +0100
commit2e54755b9afacdb2d001b7ad4a81a8a23b6f43e0 (patch)
treeb258faa94aaf6115dda8dc5117c443b2d5e8d6df /tools/testcase1.py
parent6df4a9012f03af16779ae4172831367881b4090b (diff)
Parallelised merge, distribution phase.
Diffstat (limited to 'tools/testcase1.py')
-rwxr-xr-xtools/testcase1.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/testcase1.py b/tools/testcase1.py
index dbafe7a..5192074 100755
--- a/tools/testcase1.py
+++ b/tools/testcase1.py
@@ -13,6 +13,7 @@ import struct
import hashlib
import itertools
import os.path
+from time import sleep
from certtools import *
baseurls = [sys.argv[1]]
@@ -148,8 +149,10 @@ def get_and_check_entry(timestamp, chain, leaf_index, baseurl):
len(submittedcertchain))
def merge():
- return subprocess.call([toolsdir + "/merge", "--config", testdir + "/catlfish-test.cfg",
+ rv = subprocess.call([toolsdir + "/merge", "--config", testdir + "/catlfish-test.cfg",
"--localconfig", testdir + "/catlfish-test-local-merge.cfg"])
+ sleep(5) # FIXME: Just wait for dist instead.
+ return rv
mergeresult = merge()
assert_equal(mergeresult, 0, "merge", quiet=True, fatal=True)