[qa] pull-tester: Fix assertion and check for run_parallel

This commit is contained in:
MarcoFalke 2016-05-09 21:29:18 +02:00 committed by Jack Grigg
parent 63a3c9aceb
commit fd7689ff07
1 changed files with 2 additions and 2 deletions

View File

@ -231,7 +231,7 @@ def runtests():
if coverage: if coverage:
flags.append(coverage.flag) flags.append(coverage.flag)
if len(test_list) > 1: if len(test_list) > 1 and run_parallel > 1:
# Populate cache # Populate cache
subprocess.check_output([RPC_TESTS_DIR + 'create_cache.py'] + flags) subprocess.check_output([RPC_TESTS_DIR + 'create_cache.py'] + flags)
@ -291,7 +291,7 @@ class RPCTestHandler:
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE))) stderr=subprocess.PIPE)))
if not self.jobs: if not self.jobs:
raise IndexError('%s from empty list' % __name__) raise IndexError('pop from empty list')
while True: while True:
# Return first proc that finishes # Return first proc that finishes
time.sleep(.5) time.sleep(.5)