diff options
author | Linus Nordberg <linus@nordu.net> | 2017-01-24 09:16:28 +0100 |
---|---|---|
committer | Linus Nordberg <linus@nordu.net> | 2017-02-01 11:24:28 +0100 |
commit | b7b8903b6a7c3342933b9984afa72fb6527b5f72 (patch) | |
tree | fc92bfb8b1dccd1dca3f24cba98cf3ea540687bc /tools/testcase1.py | |
parent | c0d8aceccb0961a25ee58a163441bbcbe6d6ea3d (diff) |
Parallelised merge, distribution phase.
Diffstat (limited to 'tools/testcase1.py')
-rwxr-xr-x | tools/testcase1.py | 5 |
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) |