2 files changed, 62 insertions, 10 deletions

diff --git a/tests/unit/benchmark/scenarios/compute/test_qemumigrate.py b/tests/unit/benchmark/scenarios/compute/test_qemumigrate.py
index f163f1914..1f0ff3c29 100644
--- a/tests/unit/benchmark/scenarios/compute/test_qemumigrate.py
+++ b/tests/unit/benchmark/scenarios/compute/test_qemumigrate.py
@@ -16,6 +16,7 @@ from __future__ import absolute_import
 import unittest
 
 import mock
+from oslo_serialization import jsonutils
 
 from yardstick.benchmark.scenarios.compute import qemu_migrate
 
@@ -83,7 +84,7 @@ class QemuMigrateTestCase(unittest.TestCase):
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         q.run(result)
-        expected_result = {}
+        expected_result = jsonutils.loads(sample_output)
         self.assertEqual(result, expected_result)
 
     def test_qemu_migrate_successful_sla(self, mock_ssh):
@@ -103,7 +104,7 @@ class QemuMigrateTestCase(unittest.TestCase):
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
 
         q.run(result)
-        expected_result = {}
+        expected_result = jsonutils.loads(sample_output)
         self.assertEqual(result, expected_result)
 
     def test_qemu_migrate_unsuccessful_sla_totaltime(self, mock_ssh):
@@ -117,8 +118,7 @@ class QemuMigrateTestCase(unittest.TestCase):
         sample_output = '{"totaltime": 15, "downtime": 2, "setuptime": 1}'
 
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-        with self.assertRaises(AssertionError):
-          q.run(result)
+        self.assertRaises(AssertionError, q.run, result)
 
     def test_qemu_migrate_unsuccessful_sla_downtime(self, mock_ssh):
 
@@ -131,8 +131,7 @@ class QemuMigrateTestCase(unittest.TestCase):
         sample_output = '{"totaltime": 15, "downtime": 2, "setuptime": 1}'
 
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-        with self.assertRaises(AssertionError):
-          q.run(result)
+        self.assertRaises(AssertionError, q.run, result)
 
     def test_qemu_migrate_unsuccessful_sla_setuptime(self, mock_ssh):
 
@@ -145,8 +144,7 @@ class QemuMigrateTestCase(unittest.TestCase):
         sample_output = '{"totaltime": 15, "downtime": 2, "setuptime": 1}'
 
         mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-        with self.assertRaises(AssertionError):
-          q.run(result)
+        self.assertRaises(AssertionError, q.run, result)
 
     def test_qemu_migrate_unsuccessful_script_error(self, mock_ssh):
 
@@ -156,9 +154,10 @@ class QemuMigrateTestCase(unittest.TestCase):
         mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         q.setup()
 
+
         mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
-        with self.assertRaises(RuntimeError):
-          q.run(result)
+        self.assertRaises(RuntimeError, q.run, result)
+
 
 def main():
     unittest.main()
diff --git a/tests/unit/benchmark/scenarios/test_base.py b/tests/unit/benchmark/scenarios/test_base.py
new file mode 100644
index 000000000..78e342978
--- /dev/null
+++ b/tests/unit/benchmark/scenarios/test_base.py
@@ -0,0 +1,53 @@
+# Copyright 2017: Intel Ltd.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import unittest
+
+from yardstick.benchmark.scenarios import base
+
+
+class ScenarioTestCase(unittest.TestCase):
+
+    def test_get_scenario_type(self):
+        scenario_type = 'dummy scenario'
+
+        class DummyScenario(base.Scenario):
+            __scenario_type__ = scenario_type
+
+        self.assertEqual(scenario_type, DummyScenario.get_scenario_type())
+
+    def test_get_scenario_type_not_defined(self):
+        class DummyScenario(base.Scenario):
+            pass
+
+        self.assertEqual(str(None), DummyScenario.get_scenario_type())
+
+    def test_get_description(self):
+        docstring = """First line
+            Second line
+            Third line
+        """
+
+        class DummyScenario(base.Scenario):
+            __doc__ = docstring
+
+        self.assertEqual(docstring.splitlines()[0],
+                         DummyScenario.get_description())
+
+    def test_get_description_empty(self):
+        class DummyScenario(base.Scenario):
+            pass
+
+        self.assertEqual(str(None), DummyScenario.get_description())