aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKubi <jean.gaoliang@huawei.com>2017-08-10 06:18:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-10 06:18:58 +0000
commit04ab053f3b1f8118178eeb5b89fdf255ac9f8ab1 (patch)
treea76a736fea5c22c5861676fdd287b45f69fc471b
parent89fe59588ec6bf7da5df53cbab61731e476912c3 (diff)
parentb418d0561a35085e70bc2e56838d38fca9d9d133 (diff)
Merge "bugfix: tc037/38 multiprocessing failed sometimes"
-rw-r--r--yardstick/benchmark/core/task.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py
index 703bb6d95..395f3b8e8 100644
--- a/yardstick/benchmark/core/task.py
+++ b/yardstick/benchmark/core/task.py
@@ -38,6 +38,7 @@ output_file_default = "/tmp/yardstick.out"
config_file = '/etc/yardstick/yardstick.conf'
test_cases_dir_default = "tests/opnfv/test_cases/"
LOG = logging.getLogger(__name__)
+JOIN_TIMEOUT = 60
class Task(object): # pragma: no cover
@@ -263,13 +264,12 @@ class Task(object): # pragma: no cover
# Wait for background runners to finish
for runner in background_runners:
- status = runner.join(timeout=60)
+ status = runner.join(JOIN_TIMEOUT)
if status is None:
# Nuke if it did not stop nicely
base_runner.Runner.terminate(runner)
- status = runner_join(runner)
- else:
- base_runner.Runner.release(runner)
+ runner.join(JOIN_TIMEOUT)
+ base_runner.Runner.release(runner)
self.outputs.update(runner.get_output())
result.extend(runner.get_result())