From fa3b3792522681207b3619edec5f3175be6fc841 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 9 May 2016 21:29:18 +0200
Subject: [PATCH] [qa] pull-tester: Fix assertion and check for run_parallel
---
qa/pull-tester/rpc-tests.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 57a576f1c7b..98823085034 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)