From a3138d2df2375d36311114310fcf96a787101e46 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 12 Jul 2018 10:48:17 +0200 Subject: Skip testcases by any env var MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also removes CI_LOOP which is releng centric. It can be passed as dependency if required. Change-Id: I146bb97950cb88062451158b7cc6a16c7f9d47a2 Signed-off-by: Cédric Ollivier --- xtesting/tests/unit/ci/test_tier_handler.py | 53 ++--------------------------- 1 file changed, 2 insertions(+), 51 deletions(-) (limited to 'xtesting/tests/unit/ci/test_tier_handler.py') diff --git a/xtesting/tests/unit/ci/test_tier_handler.py b/xtesting/tests/unit/ci/test_tier_handler.py index 97ba5ab3..21670dd9 100644 --- a/xtesting/tests/unit/ci/test_tier_handler.py +++ b/xtesting/tests/unit/ci/test_tier_handler.py @@ -22,19 +22,12 @@ class TierHandlerTesting(unittest.TestCase): self.test = mock.Mock() attrs = {'get_name.return_value': 'test_name'} self.test.configure_mock(**attrs) - self.mock_depend = mock.Mock() - attrs = {'get_scenario.return_value': 'test_scenario', - 'get_installer.return_value': 'test_installer'} - self.mock_depend.configure_mock(**attrs) self.tier = tier_handler.Tier( - 'test_tier', 'test_order', 'test_ci_loop', description='test_desc') + 'test_tier', 'test_order', 'test_desc') self.testcase = tier_handler.TestCase( - 'test_name', 'true', self.mock_depend, 'test_criteria', + 'test_name', 'true', 'test_criteria', True, description='test_desc', project='project_name') - self.dependency = tier_handler.Dependency( - 'test_installer', 'test_scenario') self.testcase.str = self.testcase.__str__() - self.dependency.str = self.dependency.__str__() self.tier.str = self.tier.__str__() def test_split_text(self): @@ -77,39 +70,6 @@ class TierHandlerTesting(unittest.TestCase): def test_get_order(self): self.assertEqual(self.tier.get_order(), 'test_order') - def test_get_ci_loop(self): - self.assertEqual(self.tier.get_ci_loop(), 'test_ci_loop') - - def test_testcase_is_compatible(self): - self.assertEqual( - self.testcase.is_compatible('test_installer', 'test_scenario'), - True) - - def test_testcase_is_compatible_2(self): - self.assertEqual( - self.testcase.is_compatible('missing_installer', 'test_scenario'), - False) - self.assertEqual( - self.testcase.is_compatible('test_installer', 'missing_scenario'), - False) - - @mock.patch('re.search', side_effect=TypeError) - def test_testcase_is_compatible3(self, *args): - self.assertEqual( - self.testcase.is_compatible('test_installer', 'test_scenario'), - False) - args[0].assert_called_once_with('test_installer', 'test_installer') - - def test_testcase_is_compatible_4(self): - self.assertEqual( - self.testcase.is_compatible(None, 'test_scenario'), False) - self.assertEqual( - self.testcase.is_compatible('', 'test_scenario'), False) - self.assertEqual( - self.testcase.is_compatible('test_installer', None), False) - self.assertEqual( - self.testcase.is_compatible('test_installer', ''), False) - def test_testcase_get_name(self): self.assertEqual(self.tier.get_name(), 'test_tier') @@ -128,15 +88,6 @@ class TierHandlerTesting(unittest.TestCase): def test_testcase_get_order(self): self.assertEqual(self.tier.get_order(), 'test_order') - def test_testcase_get_ci_loop(self): - self.assertEqual(self.tier.get_ci_loop(), 'test_ci_loop') - - def test_dependency_get_installer(self): - self.assertEqual(self.dependency.get_installer(), 'test_installer') - - def test_dependency_get_scenario(self): - self.assertEqual(self.dependency.get_scenario(), 'test_scenario') - if __name__ == "__main__": logging.disable(logging.CRITICAL) -- cgit 1.2.3-korg