Merge "Remove unused _get_flags method from integrated_helpers"

This commit is contained in:
Jenkins 2016-06-10 15:11:31 +00:00 committed by Gerrit Code Review
commit 6999c6424f

View File

@ -66,8 +66,6 @@ class _IntegratedTestBase(test.TestCase):
def setUp(self): def setUp(self):
super(_IntegratedTestBase, self).setUp() super(_IntegratedTestBase, self).setUp()
f = self._get_flags()
self.flags(**f)
self.flags(verbose=True) self.flags(verbose=True)
nova.tests.unit.image.fake.stub_out_image_service(self) nova.tests.unit.image.fake.stub_out_image_service(self)
@ -103,14 +101,6 @@ class _IntegratedTestBase(test.TestCase):
self.network = self.start_service('network') self.network = self.start_service('network')
self.scheduler = self._setup_scheduler_service() self.scheduler = self._setup_scheduler_service()
def _get_flags(self):
"""Allow subclass to modify global config before we start services."""
# NOTE(sdague): _get_flags is used by about 13 tests that
# subclass this mostly to modify the extensions list. We
# should instead make that declarative in the future, at which
# point we can get rid of this.
return {}
def get_unused_server_name(self): def get_unused_server_name(self):
servers = self.api.get_servers() servers = self.api.get_servers()
server_names = [server['name'] for server in servers] server_names = [server['name'] for server in servers]