Improve the way of getting env values

[functest.git] / functest / tests / unit / cli / commands / test_cli_tier.py

diff --git a/functest/tests/unit/cli/commands/test_cli_tier.py b/functest/tests/unit/cli/commands/test_cli_tier.py
index abcdc59..f81ad31 100644 (file)
--- a/functest/tests/unit/cli/commands/test_cli_tier.py
+++ b/functest/tests/unit/cli/commands/test_cli_tier.py
@@ -5,6 +5,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+# pylint: disable=missing-docstring
 
 import logging
 import unittest
@@ -12,7 +13,6 @@ import unittest
 import mock
 
 from functest.cli.commands import cli_tier
-from functest.utils.constants import CONST
 
 
 class CliTierTesting(unittest.TestCase):
@@ -20,7 +20,7 @@ class CliTierTesting(unittest.TestCase):
     def setUp(self):
         self.tiername = 'tiername'
         self.testnames = 'testnames'
-        with mock.patch('functest.cli.commands.cli_tier.tb'):
+        with mock.patch('functest.ci.tier_builder'):
             self.cli_tier = cli_tier.CliTier()
 
     @mock.patch('functest.cli.commands.cli_tier.click.echo')
@@ -58,10 +58,9 @@ class CliTierTesting(unittest.TestCase):
         with mock.patch.object(self.cli_tier.tiers, 'get_tier',
                                return_value=mock_obj):
             self.cli_tier.gettests(self.tiername)
-            mock_click_echo.assert_called_with("Test cases in tier "
-                                               "'%s':\n %s\n" % (self.tiername,
-                                                                 self.testnames
-                                                                 ))
+            mock_click_echo.assert_called_with(
+                "Test cases in tier '%s':\n %s\n" % (
+                    self.tiername, self.testnames))
 
     @mock.patch('functest.cli.commands.cli_tier.click.echo')
     def test_gettests_missing_tier(self, mock_click_echo):
@@ -75,51 +74,27 @@ class CliTierTesting(unittest.TestCase):
                                                ":\n  %s\n" % (self.tiername,
                                                               'tiernames'))
 
-    @mock.patch('functest.cli.commands.cli_tier.os.path.isfile',
-                return_value=False)
-    @mock.patch('functest.cli.commands.cli_tier.click.echo')
-    def test_run_missing_env_file(self, mock_click_echo, mock_os):
-        self.cli_tier.run(self.tiername)
-        mock_click_echo.assert_called_with("Functest environment is not ready."
-                                           " Run first 'functest env prepare'")
-
-    @mock.patch('functest.cli.commands.cli_tier.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_tier.ft_utils.execute_command')
-    def test_run_default(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" % (CONST.dir_repo_functest, "-n -r ",
-                             self.tiername))
+    @mock.patch('functest.utils.functest_utils.execute_command')
+    def test_run_default(self, mock_ft_utils):
+        cmd = "run_tests -n -r -t {}".format(self.tiername)
         self.cli_tier.run(self.tiername, noclean=True, report=True)
         mock_ft_utils.assert_called_with(cmd)
 
-    @mock.patch('functest.cli.commands.cli_tier.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_tier.ft_utils.execute_command')
-    def test_run_report_missing_noclean(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" % (CONST.dir_repo_functest, "-r ",
-                             self.tiername))
+    @mock.patch('functest.utils.functest_utils.execute_command')
+    def test_run_report_missing_noclean(self, mock_ft_utils):
+        cmd = "run_tests -r -t {}".format(self.tiername)
         self.cli_tier.run(self.tiername, noclean=False, report=True)
         mock_ft_utils.assert_called_with(cmd)
 
-    @mock.patch('functest.cli.commands.cli_tier.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_tier.ft_utils.execute_command')
-    def test_run_noclean_missing_report(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" % (CONST.dir_repo_functest, "-n ",
-                             self.tiername))
+    @mock.patch('functest.utils.functest_utils.execute_command')
+    def test_run_noclean_missing_report(self, mock_ft_utils):
+        cmd = "run_tests -n -t {}".format(self.tiername)
         self.cli_tier.run(self.tiername, noclean=True, report=False)
         mock_ft_utils.assert_called_with(cmd)
 
-    @mock.patch('functest.cli.commands.cli_tier.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_tier.ft_utils.execute_command')
-    def test_run_missing_noclean_report(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" % (CONST.dir_repo_functest, "",
-                             self.tiername))
+    @mock.patch('functest.utils.functest_utils.execute_command')
+    def test_run_missing_noclean_report(self, mock_ft_utils):
+        cmd = "run_tests -t {}".format(self.tiername)
         self.cli_tier.run(self.tiername, noclean=False, report=False)
         mock_ft_utils.assert_called_with(cmd)