diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-05-09 21:29:18 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-06-17 15:20:43 +0200 |
| commit | fa3b3792522681207b3619edec5f3175be6fc841 (patch) | |
| tree | 48081affee2a7f13bf6a19823f6d801faa24e998 /qa/pull-tester | |
| parent | fa324653ab7a44a89d6a692ce8f953ded8501e17 (diff) | |
| download | bitcoin-fa3b3792522681207b3619edec5f3175be6fc841.tar.xz | |
[qa] pull-tester: Fix assertion and check for run_parallel
Diffstat (limited to 'qa/pull-tester')
| -rwxr-xr-x | qa/pull-tester/rpc-tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index 57a576f1c7..9882308503 100755 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -191,7 +191,7 @@ def runtests(): if coverage: flags.append(coverage.flag) - if len(test_list) > 1: + if len(test_list) > 1 and run_parallel > 1: # Populate cache subprocess.check_output([RPC_TESTS_DIR + 'create_cache.py'] + flags) @@ -251,7 +251,7 @@ class RPCTestHandler: stdout=subprocess.PIPE, stderr=subprocess.PIPE))) if not self.jobs: - raise IndexError('%s from empty list' % __name__) + raise IndexError('pop from empty list') while True: # Return first proc that finishes time.sleep(.5) |