X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Ftests%2Funit%2Fcli%2Fcommands%2Ftest_cli_testcase.py;h=67bf2d5039b4d1b90fe10e8342544105eb0d2ef9;hb=5cb9051a0418815636a1d5df66940e168c4e0a56;hp=4d0bdc2f3e6e649ad9e1760a59498326f3858a91;hpb=997a42438f2253aa9fe640c1cbdd8ea461901948;p=functest.git

diff --git a/functest/tests/unit/cli/commands/test_cli_testcase.py b/functest/tests/unit/cli/commands/test_cli_testcase.py
index 4d0bdc2f3..67bf2d503 100644
--- a/functest/tests/unit/cli/commands/test_cli_testcase.py
+++ b/functest/tests/unit/cli/commands/test_cli_testcase.py
@@ -5,9 +5,9 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+# pylint: disable=missing-docstring
 
 import logging
-import pkg_resources
 import unittest
 
 import mock
@@ -19,63 +19,30 @@ class CliTestCasesTesting(unittest.TestCase):
 
     def setUp(self):
         self.testname = 'testname'
-        with mock.patch('functest.cli.commands.cli_testcase.tb'):
+        with mock.patch('xtesting.ci.tier_builder'):
             self.cli_tests = cli_testcase.CliTestcase()
 
-    @mock.patch('functest.cli.commands.cli_testcase.vacation.main')
-    def test_run_vacation(self, mock_method):
-        self.cli_tests.run('vacation')
-        self.assertTrue(mock_method.called)
-
-    @mock.patch('functest.cli.commands.cli_testcase.os.path.isfile',
-                return_value=False)
-    @mock.patch('functest.cli.commands.cli_testcase.click.echo')
-    def test_run_missing_env_file(self, mock_click_echo, mock_os):
-        self.cli_tests.run(self.testname)
-        mock_click_echo.assert_called_with("Functest environment is not ready."
-                                           " Run first 'functest env prepare'")
-
-    @mock.patch('functest.cli.commands.cli_testcase.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
-    def test_run_default(self, mock_ft_utils, mock_os):
-        cmd = ("python %s %s -t %s" %
-               (pkg_resources.resource_filename(
-                   'functest', 'ci/run_tests.py'),
-                "-n -r ", self.testname))
+    @mock.patch('functest.utils.functest_utils.execute_command')
+    def test_run_default(self, mock_ft_utils):
+        cmd = "run_tests -n -r -t {}".format(self.testname)
         self.cli_tests.run(self.testname, noclean=True, report=True)
         mock_ft_utils.assert_called_with(cmd)
 
-    @mock.patch('functest.cli.commands.cli_testcase.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
-    def test_run_noclean_missing_report(self, mock_ft_utils, mock_os):
-        cmd = ("python %s %s -t %s" %
-               (pkg_resources.resource_filename(
-                   'functest', 'ci/run_tests.py'),
-                "-n ", self.testname))
+    @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.testname)
         self.cli_tests.run(self.testname, noclean=True, report=False)
         mock_ft_utils.assert_called_with(cmd)
 
-    @mock.patch('functest.cli.commands.cli_testcase.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
-    def test_run_report_missing_noclean(self, mock_ft_utils, mock_os):
-        cmd = ("python %s %s -t %s" %
-               (pkg_resources.resource_filename(
-                   'functest', 'ci/run_tests.py'),
-                "-r ", self.testname))
+    @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.testname)
         self.cli_tests.run(self.testname, noclean=False, report=True)
         mock_ft_utils.assert_called_with(cmd)
 
-    @mock.patch('functest.cli.commands.cli_testcase.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
-    def test_run_missing_noclean_report(self, mock_ft_utils, mock_os):
-        cmd = ("python %s %s -t %s" %
-               (pkg_resources.resource_filename(
-                   'functest', 'ci/run_tests.py'),
-                "", self.testname))
+    @mock.patch('functest.utils.functest_utils.execute_command')
+    def test_run_missing_noclean_report(self, mock_ft_utils):
+        cmd = "run_tests -t {}".format(self.testname)
         self.cli_tests.run(self.testname, noclean=False, report=False)
         mock_ft_utils.assert_called_with(cmd)