diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2018-10-04 09:56:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-04 09:56:37 +0000 |
| commit | 44d77847d87f7511ca1e7b2e65d96b1239361340 (patch) | |
| tree | 3bc95c8d5a70c4c2b7da8a779fd85740828276d1 /yardstick/benchmark/runners/proxduration.py | |
| parent | b2407946ba2c1011eb4e3b72fe604ba66a7147df (diff) | |
| parent | 5f84d63605d7dbcf23ef329680b6721953bd598b (diff) | |
Merge "NSB PROX NFVi Test does not stop after reaching expected precision" into stable/gambia
Diffstat (limited to 'yardstick/benchmark/runners/proxduration.py')
| -rw-r--r-- | yardstick/benchmark/runners/proxduration.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/yardstick/benchmark/runners/proxduration.py b/yardstick/benchmark/runners/proxduration.py index 61a468fd3..e217904b9 100644 --- a/yardstick/benchmark/runners/proxduration.py +++ b/yardstick/benchmark/runners/proxduration.py @@ -112,7 +112,8 @@ def _worker_process(queue, cls, method_name, scenario_cfg, sequence += 1 - if (errors and sla_action is None) or time.time() > timeout or aborted.is_set(): + if ((errors and sla_action is None) or time.time() > timeout + or aborted.is_set() or benchmark.is_ended()): LOG.info("Worker END") break |