From d4996440fa16297aee7a925e6357a9cfd42d24f8 Mon Sep 17 00:00:00 2001 From: Jose Lausuch Date: Wed, 15 Nov 2017 17:11:41 +0100 Subject: Remove prepare_env After moving the rally installation out of prepare_env It doesn't much sense to keep this script as it doesn't do useful things any more. Change-Id: I9ab3b2dd30c8ec0fbb825ee4302a83cce80f1cbe Signed-off-by: Jose Lausuch --- .../tests/unit/cli/commands/test_cli_testcase.py | 24 ++++------------------ 1 file changed, 4 insertions(+), 20 deletions(-) (limited to '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 9ccf4c4ac..f3648eb05 100644 --- a/functest/tests/unit/cli/commands/test_cli_testcase.py +++ b/functest/tests/unit/cli/commands/test_cli_testcase.py @@ -26,42 +26,26 @@ class CliTestCasesTesting(unittest.TestCase): 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): + 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): + 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): + 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): + 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) -- cgit 1.2.3-korg