Merge changes from topics 'YARDSTICK-1343', 'YARDSTICK-1342'

* changes:
  Cleanup EnvironmentTestCase unit tests
  Cleanup Testcase unit tests

3 files changed, 22 insertions, 21 deletions

diff --git a/yardstick/service/environment.py b/yardstick/service/environment.py
index 324589f79..d910e31e9 100644
--- a/yardstick/service/environment.py
+++ b/yardstick/service/environment.py
@@ -36,7 +36,7 @@ class Environment(Service):
 
         return self._format_sut_info(sut_info)
 
-    def _load_pod_info(self):
+    def _load_pod_info(self):  # pragma: no cover
         if self.pod is None:
             raise MissingPodInfoError
 
@@ -51,10 +51,10 @@ class Environment(Service):
         except (ValueError, KeyError):
             raise UnsupportedPodFormatError
 
-    def _format_sut_info(self, sut_info):
+    def _format_sut_info(self, sut_info):  # pragma: no cover
         return {k: self._format_node_info(v) for k, v in sut_info.items()}
 
-    def _format_node_info(self, node_info):
+    def _format_node_info(self, node_info):  # pragma: no cover
         info = []
         facts = node_info.get('ansible_facts', {})
 
@@ -93,9 +93,9 @@ class Environment(Service):
 
         return info
 
-    def _get_interface_info(self, facts, name):
+    def _get_interface_info(self, facts, name):  # pragma: no cover
         mac = facts.get('ansible_{}'.format(name), {}).get('macaddress')
         return [name, mac] if mac else []
 
-    def _get_device_info(self, name, info):
+    def _get_device_info(self, name, info):  # pragma: no cover
         return ['disk_{}'.format(name), info.get('size')]
diff --git a/yardstick/tests/unit/benchmark/core/test_testcase.py b/yardstick/tests/unit/benchmark/core/test_testcase.py
index 119465887..077848d77 100644
--- a/yardstick/tests/unit/benchmark/core/test_testcase.py
+++ b/yardstick/tests/unit/benchmark/core/test_testcase.py
@@ -7,28 +7,28 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# Unittest for yardstick.cmd.commands.testcase
-
-from __future__ import absolute_import
-import unittest
+import mock
+from six.moves import builtins
 
 from yardstick.benchmark.core import testcase
+from yardstick.tests.unit import base as ut_base
 
 
 class Arg(object):
 
     def __init__(self):
-        self.casename = ('opnfv_yardstick_tc001',)
+        self.casename = ('opnfv_yardstick_tc001', )
 
 
-class TestcaseUT(unittest.TestCase):
+class TestcaseTestCase(ut_base.BaseUnitTestCase):
 
     def test_list_all(self):
         t = testcase.Testcase()
         result = t.list_all("")
         self.assertIsInstance(result, list)
 
-    def test_show(self):
+    @mock.patch.object(builtins, 'print')
+    def test_show(self, *args):
         t = testcase.Testcase()
         casename = Arg()
         result = t.show(casename)
diff --git a/yardstick/tests/unit/service/test_environment.py b/yardstick/tests/unit/service/test_environment.py
index be4882e30..779e6eaa0 100644
--- a/yardstick/tests/unit/service/test_environment.py
+++ b/yardstick/tests/unit/service/test_environment.py
@@ -9,9 +9,8 @@
 
 import mock
 
-from yardstick.common.exceptions import UnsupportedPodFormatError
-from yardstick.service.environment import Environment
-from yardstick.service.environment import AnsibleCommon
+from yardstick.common import exceptions
+from yardstick.service import environment
 from yardstick.tests.unit import base as ut_base
 
 
@@ -31,15 +30,17 @@ class EnvironmentTestCase(ut_base.BaseUnitTestCase):
             ]
         }
 
-        with mock.patch.object(AnsibleCommon, 'gen_inventory_ini_dict'), \
-                mock.patch.object(AnsibleCommon, 'get_sut_info',
-                                  return_value={'node1': {}}):
-            env = Environment(pod=pod_info)
+        with mock.patch.object(environment.AnsibleCommon,
+                               'gen_inventory_ini_dict'), \
+                mock.patch.object(environment.AnsibleCommon, 'get_sut_info',
+                                  return_value={'node1': {}}), \
+                mock.patch.object(environment.Environment, '_format_sut_info'):
+            env = environment.Environment(pod=pod_info)
             env.get_sut_info()
 
     def test_get_sut_info_pod_str(self):
         pod_info = 'nodes'
 
-        env = Environment(pod=pod_info)
-        with self.assertRaises(UnsupportedPodFormatError):
+        env = environment.Environment(pod=pod_info)
+        with self.assertRaises(exceptions.UnsupportedPodFormatError):
             env.get_sut_info()