From a6e4fc7fae4c2bb11c6fb9f6a539db3fba554703 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 18 Jan 2016 17:23:20 +0000 Subject: [PATCH] FunctionalTests don't run non-test check_skip_test This is actually a helper function which is called from the base-class setUp methods, but we're running it like a test because the test runner sees "test" in the name. Change-Id: I9d350471a3f3f40a201294adebd7752e3a7aa020 --- heat_integrationtests/functional/functional_base.py | 4 ++-- heat_integrationtests/scenario/scenario_base.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heat_integrationtests/functional/functional_base.py b/heat_integrationtests/functional/functional_base.py index 3dff3e4591..452e055354 100644 --- a/heat_integrationtests/functional/functional_base.py +++ b/heat_integrationtests/functional/functional_base.py @@ -17,10 +17,10 @@ class FunctionalTestsBase(test.HeatIntegrationTest): def setUp(self): super(FunctionalTestsBase, self).setUp() - self.check_skip_test() + self.check_skip() self.client = self.orchestration_client - def check_skip_test(self): + def check_skip(self): test_cls_name = self.__class__.__name__ test_method_name = '.'.join([test_cls_name, self._testMethodName]) test_skipped = (self.conf.skip_functional_test_list and ( diff --git a/heat_integrationtests/scenario/scenario_base.py b/heat_integrationtests/scenario/scenario_base.py index 14b8cec4b4..66069ff774 100644 --- a/heat_integrationtests/scenario/scenario_base.py +++ b/heat_integrationtests/scenario/scenario_base.py @@ -18,7 +18,7 @@ class ScenarioTestsBase(test.HeatIntegrationTest): def setUp(self): super(ScenarioTestsBase, self).setUp() - self.check_skip_test() + self.check_skip() self.client = self.orchestration_client self.sub_dir = 'templates' @@ -58,7 +58,7 @@ class ScenarioTestsBase(test.HeatIntegrationTest): return stack_id - def check_skip_test(self): + def check_skip(self): test_cls_name = self.__class__.__name__ test_method_name = '.'.join([test_cls_name, self._testMethodName]) test_skipped = (self.conf.skip_scenario_test_list and (