Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Merge "Extend ixnet api"
[yardstick.git]
/
yardstick
/
benchmark
/
runners
/
proxduration.py
diff --git
a/yardstick/benchmark/runners/proxduration.py
b/yardstick/benchmark/runners/proxduration.py
index
61a468f
..
e217904
100644
(file)
--- 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