Leverage on Xtesting

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

diff --git a/functest/tests/unit/cli/commands/test_cli_testcase.py b/functest/tests/unit/cli/commands/test_cli_testcase.py
index 72a2708..67bf2d5 100644 (file)
--- a/functest/tests/unit/cli/commands/test_cli_testcase.py
+++ b/functest/tests/unit/cli/commands/test_cli_testcase.py
@@ -19,33 +19,28 @@ 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.ft_utils.execute_command')
+    @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.ft_utils.execute_command')
+    @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.ft_utils.execute_command')
+    @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.ft_utils.execute_command')
+    @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)