diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-10 13:04:11 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-12 12:08:52 +0200 |
| commit | a9491ef0948f8fe3eb3772b6b6ae44d86bde7e9b (patch) | |
| tree | 9dfc1985294fed2e579dc662da9d589baa0be9b8 /xtesting/tests | |
| parent | b7f4eaa213b65a266f527d9def7679eac7e0353b (diff) | |
Skip the selected testcase too0.56
It completes "Allow calling a skip test" [1]
[1] https://gerrit.opnfv.org/gerrit/60655
Change-Id: I02499aed56e6b23563165ea1f17b476e12408823
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'xtesting/tests')
| -rw-r--r-- | xtesting/tests/unit/ci/test_run_tests.py | 41 | ||||
| -rw-r--r-- | xtesting/tests/unit/ci/test_tier_handler.py | 2 |
2 files changed, 41 insertions, 2 deletions
diff --git a/xtesting/tests/unit/ci/test_run_tests.py b/xtesting/tests/unit/ci/test_run_tests.py index 448b6f3f..392612bd 100644 --- a/xtesting/tests/unit/ci/test_run_tests.py +++ b/xtesting/tests/unit/ci/test_run_tests.py @@ -130,6 +130,8 @@ class RunTestsTesting(unittest.TestCase): def test_run_tests_import_exception(self, *args): mock_test = mock.Mock() kwargs = {'get_name.return_value': 'test_name', + 'is_skipped.return_value': False, + 'is_enabled.return_value': True, 'needs_clean.return_value': False} mock_test.configure_mock(**kwargs) with self.assertRaises(Exception) as context: @@ -145,6 +147,8 @@ class RunTestsTesting(unittest.TestCase): def test_run_tests_default(self, *args): mock_test = mock.Mock() kwargs = {'get_name.return_value': 'test_name', + 'is_skipped.return_value': False, + 'is_enabled.return_value': True, 'needs_clean.return_value': True} mock_test.configure_mock(**kwargs) test_run_dict = {'module': 'test_module', @@ -153,12 +157,47 @@ class RunTestsTesting(unittest.TestCase): return_value=test_run_dict): self.runner.clean_flag = True self.runner.run_test(mock_test) - args[0].assert_called_with('test_name') args[1].assert_called_with('test_module') self.assertEqual(self.runner.overall_result, run_tests.Result.EX_OK) + @mock.patch('xtesting.ci.run_tests.Runner.get_dict_by_test') + def test_run_tests_disabled(self, *args): + mock_test = mock.Mock() + kwargs = {'get_name.return_value': 'test_name', + 'is_skipped.return_value': False, + 'is_enabled.return_value': False, + 'needs_clean.return_value': True} + mock_test.configure_mock(**kwargs) + test_run_dict = {'module': 'test_module', + 'class': 'test_class'} + with mock.patch('xtesting.ci.run_tests.Runner.get_run_dict', + return_value=test_run_dict): + self.runner.clean_flag = True + self.runner.run_test(mock_test) + args[0].assert_not_called() + self.assertEqual(self.runner.overall_result, + run_tests.Result.EX_OK) + + @mock.patch('xtesting.ci.run_tests.Runner.get_dict_by_test') + def test_run_tests_skipped(self, *args): + mock_test = mock.Mock() + kwargs = {'get_name.return_value': 'test_name', + 'is_skipped.return_value': True, + 'is_enabled.return_value': True, + 'needs_clean.return_value': True} + mock_test.configure_mock(**kwargs) + test_run_dict = {'module': 'test_module', + 'class': 'test_class'} + with mock.patch('xtesting.ci.run_tests.Runner.get_run_dict', + return_value=test_run_dict): + self.runner.clean_flag = True + self.runner.run_test(mock_test) + args[0].assert_not_called() + self.assertEqual(self.runner.overall_result, + run_tests.Result.EX_OK) + @mock.patch('xtesting.ci.run_tests.Runner.run_test', return_value=TestCase.EX_OK) def test_run_tier_default(self, *mock_methods): diff --git a/xtesting/tests/unit/ci/test_tier_handler.py b/xtesting/tests/unit/ci/test_tier_handler.py index 21670dd9..2c48ac98 100644 --- a/xtesting/tests/unit/ci/test_tier_handler.py +++ b/xtesting/tests/unit/ci/test_tier_handler.py @@ -25,7 +25,7 @@ class TierHandlerTesting(unittest.TestCase): self.tier = tier_handler.Tier( 'test_tier', 'test_order', 'test_desc') self.testcase = tier_handler.TestCase( - 'test_name', 'true', 'test_criteria', + 'test_name', 'true', False, 'test_criteria', True, description='test_desc', project='project_name') self.testcase.str = self.testcase.__str__() self.tier.str = self.tier.__str__() |