Merge "Tests: Remove notification_driver config"

cinder/tests/unit/api/v1/test_volumes.py

@@ -29,7 +29,6 @@ from cinder import test
 from cinder.tests.unit.api import fakes
 from cinder.tests.unit.api.v1 import stubs
 from cinder.tests.unit import fake_constants as fake
-from cinder.tests.unit import fake_notifier
 from cinder.tests.unit import fake_volume
 from cinder.tests.unit.image import fake as fake_image
 from cinder.volume import api as volume_api
@@ -48,8 +47,6 @@ class VolumeApiTest(test.TestCase):
         fake_image.stub_out_image_service(self.stubs)
         self.controller = volumes.VolumeController(self.ext_mgr)
 
-        self.flags(host='fake',
-                   notification_driver=[fake_notifier.__name__])
         self.stubs.Set(db, 'volume_get_all', stubs.stub_volume_get_all)
         self.stubs.Set(db, 'service_get_all_by_topic',
                        stubs.stub_service_get_all_by_topic)

cinder/tests/unit/api/v2/test_volumes.py

@@ -36,7 +36,6 @@ from cinder import test
 from cinder.tests.unit.api import fakes
 from cinder.tests.unit.api.v2 import stubs
 from cinder.tests.unit import fake_constants as fake
-from cinder.tests.unit import fake_notifier
 from cinder.tests.unit import fake_volume
 from cinder.tests.unit.image import fake as fake_image
 from cinder.tests.unit import utils
@@ -57,8 +56,6 @@ class VolumeApiTest(test.TestCase):
         fake_image.stub_out_image_service(self.stubs)
         self.controller = volumes.VolumeController(self.ext_mgr)
 
-        self.flags(host='fake',
-                   notification_driver=[fake_notifier.__name__])
         self.stubs.Set(db, 'volume_get_all', stubs.stub_volume_get_all)
         self.stubs.Set(volume_api.API, 'delete', stubs.stub_volume_delete)
         self.stubs.Set(db, 'service_get_all_by_topic',

cinder/tests/unit/api/v3/test_volumes.py

@@ -23,7 +23,6 @@ from cinder import db
 from cinder import test
 from cinder.tests.unit.api import fakes
 from cinder.tests.unit import fake_constants as fake
-from cinder.tests.unit import fake_notifier
 from cinder.volume.api import API as vol_get
 
 version_header_name = 'OpenStack-API-Version'
@@ -38,8 +37,7 @@ class VolumeApiTest(test.TestCase):
         self.ext_mgr.extensions = {}
         self.controller = volumes.VolumeController(self.ext_mgr)
 
-        self.flags(host='fake',
-                   notification_driver=[fake_notifier.__name__])
+        self.flags(host='fake')
         self.ctxt = context.RequestContext(fake.USER_ID, fake.PROJECT_ID, True)
 
     def test_check_volume_filters_called(self):

cinder/tests/unit/test_volume.py

@@ -126,8 +126,7 @@ class BaseVolumeTestCase(test.TestCase):
         self.extension_manager = extension.ExtensionManager(
             "BaseVolumeTestCase")
         vol_tmpdir = tempfile.mkdtemp()
-        self.flags(volumes_dir=vol_tmpdir,
-                   notification_driver=["test"])
+        self.flags(volumes_dir=vol_tmpdir)
         self.addCleanup(self._cleanup)
         self.volume = importutils.import_object(CONF.volume_manager)
         self.volume.message_api = mock.Mock()