summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Holmgren <per.q.holmgren@ericsson.com>2015-12-17 16:15:50 +0100
committerJörgen Karlsson <jorgen.w.karlsson@ericsson.com>2015-12-21 13:33:30 +0000
commitedb23ec25362d2c0c43e124c03fe3d4fe7f1e4f0 (patch)
treed9c739cd65c4354b696f4bcb7f05e6ac9f176df9
parent7ec3f813a5b3ad755e90a0cab2295cb91a5d340b (diff)
To avoid breaking tests when monitor is set
Two runners, Arithemic and Sequence, broke running tests even if SLA "monitor" was set. Changed these two runners to work in similar fashion as the other two, i.e. that only None can break. "assert" still asserts, and "monitor" just logs but then continues. Change-Id: Ic441761cad8747e5ecfcd0babe719c1aa23981e7 JIRA: -
-rwxr-xr-xyardstick/benchmark/runners/arithmetic.py2
-rw-r--r--yardstick/benchmark/runners/sequence.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/benchmark/runners/arithmetic.py b/yardstick/benchmark/runners/arithmetic.py
index b1446e01c..7e516ea1e 100755
--- a/yardstick/benchmark/runners/arithmetic.py
+++ b/yardstick/benchmark/runners/arithmetic.py
@@ -124,7 +124,7 @@ def _worker_process(queue, cls, method_name, scenario_cfg,
sequence += 1
- if errors:
+ if (errors and sla_action is None):
break
benchmark.teardown()
diff --git a/yardstick/benchmark/runners/sequence.py b/yardstick/benchmark/runners/sequence.py
index 47708fc5e..b5fae37ad 100644
--- a/yardstick/benchmark/runners/sequence.py
+++ b/yardstick/benchmark/runners/sequence.py
@@ -96,7 +96,7 @@ def _worker_process(queue, cls, method_name, scenario_cfg,
sequence += 1
- if errors or aborted.is_set():
+ if (errors and sla_action is None) or aborted.is_set():
break
benchmark.teardown()