fix functional gate
new keystone libs are breaking the functional tests. it seems keystonemiddleware is implicitly being loaded when calling prepare_service. we don't really need to call this so let's see if it changes anything if we stop calling it. Closes-Bug: #1522166 Change-Id: If01bcb6543fe164d79f785e20668106308244f75
This commit is contained in:
@@ -29,7 +29,6 @@ from six.moves.urllib import parse as urlparse
|
||||
from ceilometer.event.storage import models
|
||||
from ceilometer.publisher import utils
|
||||
from ceilometer import sample
|
||||
from ceilometer import service
|
||||
from ceilometer import storage
|
||||
|
||||
# TODO(chdent): For now only MongoDB is supported, because of easy
|
||||
@@ -55,9 +54,9 @@ class ConfigFixture(fixture.GabbiFixture):
|
||||
if engine not in ENGINES:
|
||||
raise case.SkipTest('Database engine not supported')
|
||||
|
||||
service.prepare_service(argv=[], config_files=[])
|
||||
conf = fixture_config.Config().conf
|
||||
self.conf = conf
|
||||
self.conf([], project='ceilometer', validate_default_values=True)
|
||||
opts.set_defaults(self.conf)
|
||||
conf.import_group('api', 'ceilometer.api.controllers.v2.root')
|
||||
conf.import_opt('store_events', 'ceilometer.notification',
|
||||
|
@@ -32,7 +32,6 @@ from ceilometer.compute.notifications import instance
|
||||
from ceilometer import messaging
|
||||
from ceilometer import notification
|
||||
from ceilometer.publisher import test as test_publisher
|
||||
from ceilometer import service
|
||||
from ceilometer.tests import base as tests_base
|
||||
|
||||
TEST_NOTICE_CTXT = {
|
||||
@@ -218,7 +217,7 @@ class BaseRealNotification(tests_base.BaseTestCase):
|
||||
super(BaseRealNotification, self).setUp()
|
||||
self.CONF = self.useFixture(fixture_config.Config()).conf
|
||||
# Dummy config file to avoid looking for system config
|
||||
service.prepare_service(argv=[], config_files=[])
|
||||
self.CONF([], project='ceilometer', validate_default_values=True)
|
||||
self.setup_messaging(self.CONF, 'nova')
|
||||
|
||||
pipeline_cfg_file = self.setup_pipeline(['instance', 'memory'])
|
||||
@@ -466,7 +465,7 @@ class TestRealNotificationMultipleAgents(tests_base.BaseTestCase):
|
||||
def setUp(self):
|
||||
super(TestRealNotificationMultipleAgents, self).setUp()
|
||||
self.CONF = self.useFixture(fixture_config.Config()).conf
|
||||
service.prepare_service(argv=[], config_files=[])
|
||||
self.CONF([], project='ceilometer', validate_default_values=True)
|
||||
self.setup_messaging(self.CONF, 'nova')
|
||||
|
||||
pipeline_cfg_file = self.setup_pipeline(['instance', 'memory'])
|
||||
|
Reference in New Issue
Block a user