Merge "Change assert statements to raises in CheckValue"

3 files changed, 56 insertions, 29 deletions

diff --git a/yardstick/benchmark/scenarios/lib/check_value.py b/yardstick/benchmark/scenarios/lib/check_value.py
index 759076068..4c9b27df4 100644
--- a/yardstick/benchmark/scenarios/lib/check_value.py
+++ b/yardstick/benchmark/scenarios/lib/check_value.py
@@ -13,6 +13,7 @@ from __future__ import absolute_import
 import logging
 
 from yardstick.benchmark.scenarios import base
+from yardstick.common import exceptions as y_exc
 
 LOG = logging.getLogger(__name__)
 
@@ -34,24 +35,18 @@ class CheckValue(base.Scenario):
         self.context_cfg = context_cfg
         self.options = self.scenario_cfg['options']
 
-    def run(self, result):
+    def run(self, _):
         """execute the test"""
 
         op = self.options.get("operator")
         LOG.debug("options=%s", self.options)
         value1 = str(self.options.get("value1"))
         value2 = str(self.options.get("value2"))
+        if (op == "eq" and value1 != value2) or (op == "ne" and
+                                                 value1 == value2):
+            raise y_exc.ValueCheckError(
+                value1=value1, operator=op, value2=value2)
         check_result = "PASS"
-        if op == "eq" and value1 != value2:
-            LOG.info("value1=%s, value2=%s, error: should equal!!!", value1,
-                     value2)
-            check_result = "FAIL"
-            assert value1 == value2, "Error %s!=%s" % (value1, value2)
-        elif op == "ne" and value1 == value2:
-            LOG.info("value1=%s, value2=%s, error: should not equal!!!",
-                     value1, value2)
-            check_result = "FAIL"
-            assert value1 != value2, "Error %s==%s" % (value1, value2)
         LOG.info("Check result is %s", check_result)
         keys = self.scenario_cfg.get('output', '').split()
         values = [check_result]
diff --git a/yardstick/common/exceptions.py b/yardstick/common/exceptions.py
index 9fbe19949..b39a0af9c 100644
--- a/yardstick/common/exceptions.py
+++ b/yardstick/common/exceptions.py
@@ -412,3 +412,7 @@ class AclUnknownActionTemplate(YardstickException):
 
 class InvalidMacAddress(YardstickException):
     message = 'Mac address "%(mac_address)s" is invalid'
+
+
+class ValueCheckError(YardstickException):
+    message = 'Constraint "%(value1)s %(operator)s %(value2)s" does not hold'
diff --git a/yardstick/tests/unit/benchmark/scenarios/lib/test_check_value.py b/yardstick/tests/unit/benchmark/scenarios/lib/test_check_value.py
index 7a2324b3d..b0488bacd 100644
--- a/yardstick/tests/unit/benchmark/scenarios/lib/test_check_value.py
+++ b/yardstick/tests/unit/benchmark/scenarios/lib/test_check_value.py
@@ -8,28 +8,56 @@
 ##############################################################################
 import unittest
 
-from yardstick.benchmark.scenarios.lib.check_value import CheckValue
+from yardstick.benchmark.scenarios.lib import check_value
+from yardstick.common import exceptions as y_exc
+
 
 class CheckValueTestCase(unittest.TestCase):
 
-    def setUp(self):
-        self.result = {}
+    def test_eq_pass(self):
+        scenario_cfg = {'options': {'operator': 'eq',
+                                    'value1': 1,
+                                    'value2': 1}}
+        obj = check_value.CheckValue(scenario_cfg, {})
+        result = obj.run({})
+
+        self.assertEqual({}, result)
+
+    def test_ne_pass(self):
+        scenario_cfg = {'options': {'operator': 'ne',
+                                    'value1': 1,
+                                    'value2': 2}}
+        obj = check_value.CheckValue(scenario_cfg, {})
+        result = obj.run({})
+
+        self.assertEqual({}, result)
+
+    def test_result(self):
+        scenario_cfg = {'options': {'operator': 'eq',
+                                    'value1': 1,
+                                    'value2': 1},
+                        'output': 'foo'}
+        obj = check_value.CheckValue(scenario_cfg, {})
+        result = obj.run({})
+
+        self.assertDictEqual(result, {'foo': 'PASS'})
 
-    def test_check_value_eq(self):
-        scenario_cfg = {'options': {'operator': 'eq', 'value1': 1, 'value2': 2}}
-        obj = CheckValue(scenario_cfg, {})
-        self.assertRaises(AssertionError, obj.run, self.result)
-        self.assertEqual({}, self.result)
+    def test_eq(self):
+        scenario_cfg = {'options': {'operator': 'eq',
+                                    'value1': 1,
+                                    'value2': 2}}
+        obj = check_value.CheckValue(scenario_cfg, {})
 
-    def test_check_value_eq_pass(self):
-        scenario_cfg = {'options': {'operator': 'eq', 'value1': 1, 'value2': 1}}
-        obj = CheckValue(scenario_cfg, {})
+        with self.assertRaises(y_exc.ValueCheckError):
+            result = obj.run({})
+            self.assertEqual({}, result)
 
-        obj.run(self.result)
-        self.assertEqual({}, self.result)
+    def test_ne(self):
+        scenario_cfg = {'options': {'operator': 'ne',
+                                    'value1': 1,
+                                    'value2': 1}}
+        obj = check_value.CheckValue(scenario_cfg, {})
 
-    def test_check_value_ne(self):
-        scenario_cfg = {'options': {'operator': 'ne', 'value1': 1, 'value2': 1}}
-        obj = CheckValue(scenario_cfg, {})
-        self.assertRaises(AssertionError, obj.run, self.result)
-        self.assertEqual({}, self.result)
+        with self.assertRaises(y_exc.ValueCheckError):
+            result = obj.run({})
+            self.assertEqual({}, result)