openstack
/
congress
Code Issues Proposed changes

TestPolicyExecute no longer inherits from TestCongress 

Removed TestPolicyExecute's inheritence from TestCongress. Removed the
common attributes and method needed to run both classes' tests from
TestCongress into a superclass. Both TestCongress and TestPolicyExecute
extend the new superclass.

Closes-Bug#: 1595791

Change-Id: I1841b6567848da712f4815cf93efc6e78155f030
This commit is contained in:
aimee.ukasick 2016-07-05 15:53:24 -05:00
parent 863679fe06
commit c451d0e80a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
congress/tests2/test_congress.py
View File

@ -44,11 +44,10 @@ from congress.tests2.api import base as api_base
LOG = logging.getLogger(__name__)
class TestCongress(base.SqlTestCase):
class BaseTestPolicyCongress(base.SqlTestCase):
def setUp(self):
"""Setup tests that use multiple mock neutron instances."""
super(TestCongress, self).setUp()
super(BaseTestPolicyCongress, self).setUp()
self.services = api_base.setup_config(with_fake_datasource=False)
self.api = self.services['api']
self.node = self.services['node']
@ -75,6 +74,13 @@ class TestCongress(base.SqlTestCase):
neutron_mock.list_security_groups.return_value = sg_group_response
return neutronv2
class TestCongress(BaseTestPolicyCongress):
def setUp(self):
"""Setup tests that use multiple mock neutron instances."""
super(TestCongress, self).setUp()
def setup_config(self):
args = ['--config-file', helper.etcdir('congress.conf.test')]
config.init(args)
@ -173,7 +179,7 @@ class TestCongress(base.SqlTestCase):
helper.retry_check_function_return_value_not_eq(f, 0)
class TestPolicyExecute(TestCongress):
class TestPolicyExecute(BaseTestPolicyCongress):
def setUp(self):
super(TestPolicyExecute, self).setUp()