Add multiple-driver support to the notifier api.

Move all of the functionality previously provided by the list_notifier
into the basic notifier api.  Move and restructure tests accordingly.

Remove the list_notifier file and test file.

For bug 1025820

Change-Id: Idf7cb975dd78e9951188781622a4d10ca466b154

1 files changed, 2 insertions, 15 deletions

diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index 35ff72d..f0aab28 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -10,7 +10,6 @@ from openstack.common import cfg
 from openstack.common import jsonutils
 from openstack.common import log
 from openstack.common.notifier import api as notifier
-from openstack.common.notifier import list_notifier
 from tests import utils as test_utils
 
 CONF = cfg.CONF
@@ -86,20 +85,8 @@ class PublishErrorsHandlerTestCase(test_utils.BaseTestCase):
         super(PublishErrorsHandlerTestCase, self).setUp()
         self.publiserrorshandler = log.PublishErrorsHandler(logging.ERROR)
 
-    def test_emit_cfg_list_notifier_drivers_in_flags(self):
-        self.stub_flg = False
-
-        def fake_notifier(*args, **kwargs):
-            self.stub_flg = True
-
-        self.stubs.Set(notifier, 'notify', fake_notifier)
-        logrecord = logging.LogRecord('name', 'WARN', '/tmp', 1,
-                                      'Message', None, None)
-        self.publiserrorshandler.emit(logrecord)
-        self.assertTrue(self.stub_flg)
-
-    def test_emit_cfg_log_notifier_in_list_notifier_drivers(self):
-        self.config(list_notifier_drivers=[
+    def test_emit_cfg_log_notifier_in_notifier_drivers(self):
+        self.config(notification_driver=[
             'openstack.common.notifier.rabbit_notifier',
             'openstack.common.notifier.log_notifier'])
         self.stub_flg = True