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: -

diff --git a/yardstick/benchmark/runners/arithmetic.py b/yardstick/benchmark/runners/arithmetic.py
index b1446e0..7e516ea 100755 (executable)
--- 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 47708fc..b5fae37 100644 (file)
--- 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()