openstack/heat
Code Issues Proposed changes

Merge "FunctionalTests don't run non-test check_skip_test"

Browse Source
This commit is contained in:
Jenkins 2016-02-02 10:13:41 +00:00 committed by Gerrit Code Review
commit 818ac03064
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat_integrationtests/functional/functional_base.py
View File

@ -17,10 +17,10 @@ class FunctionalTestsBase(test.HeatIntegrationTest):
def setUp(self): def setUp(self):
super(FunctionalTestsBase, self).setUp() super(FunctionalTestsBase, self).setUp()
self.check_skip_test() self.check_skip()
self.client = self.orchestration_client self.client = self.orchestration_client
def check_skip_test(self): def check_skip(self):
test_cls_name = self.__class__.__name__ test_cls_name = self.__class__.__name__
test_method_name = '.'.join([test_cls_name, self._testMethodName]) test_method_name = '.'.join([test_cls_name, self._testMethodName])
test_skipped = (self.conf.skip_functional_test_list and ( test_skipped = (self.conf.skip_functional_test_list and (

4
heat_integrationtests/scenario/scenario_base.py
View File

@ -18,7 +18,7 @@ class ScenarioTestsBase(test.HeatIntegrationTest):
def setUp(self): def setUp(self):
super(ScenarioTestsBase, self).setUp() super(ScenarioTestsBase, self).setUp()
self.check_skip_test() self.check_skip()
self.client = self.orchestration_client self.client = self.orchestration_client
self.sub_dir = 'templates' self.sub_dir = 'templates'
@ -58,7 +58,7 @@ class ScenarioTestsBase(test.HeatIntegrationTest):
return stack_id return stack_id
def check_skip_test(self): def check_skip(self):
test_cls_name = self.__class__.__name__ test_cls_name = self.__class__.__name__
test_method_name = '.'.join([test_cls_name, self._testMethodName]) test_method_name = '.'.join([test_cls_name, self._testMethodName])
test_skipped = (self.conf.skip_scenario_test_list and ( test_skipped = (self.conf.skip_scenario_test_list and (