Update requirements from OS Global Requirements.

Update requirements.txt and test-requirements.txt from Global Requirements
defined into openstack/requirements project (stable/liberty).

Change-Id: I9ecbf5a7fb2c38624cc4f52b13515f8af75a4889
Closes-Bug: #1513118

watcher/tests/applier/framework/test_rpcapi.py

@@ -18,7 +18,7 @@
 #
 
 import mock
-import oslo.messaging as om
+import oslo_messaging as om
 from watcher.applier.framework.rpcapi import ApplierAPI
 
 from watcher.common import exception

watcher/tests/base.py

@@ -20,6 +20,7 @@ import os
 
 import mock
 from oslo_config import cfg
+from oslo_log import log
 from oslotest import base
 import pecan
 from pecan import testing
@@ -31,6 +32,7 @@ from watcher.tests import conf_fixture
 
 
 CONF = cfg.CONF
+log.register_options(CONF)
 CONF.set_override('use_stderr', False)
 
 

watcher/tests/cmd/test_decision_engine.py

@@ -22,12 +22,12 @@ import types
 from mock import patch
 from oslo_config import cfg
 from watcher.decision_engine.framework.manager import DecisionEngineManager
-from watcher.tests.base import TestCase
+from watcher.tests.base import BaseTestCase
 
 from watcher.cmd import decisionengine
 
 
-class TestDecisionEngine(TestCase):
+class TestDecisionEngine(BaseTestCase):
 
     def setUp(self):
         super(TestDecisionEngine, self).setUp()

watcher/tests/common/messaging/test_notification_handler.py

@@ -16,7 +16,7 @@
 
 
 import mock
-from oslo import messaging
+import oslo_messaging as messaging
 from watcher.common.messaging.notification_handler import NotificationHandler
 from watcher.common.messaging.utils.observable import Observable
 from watcher.tests import base

watcher/tests/decision_engine/framework/test_rpcapi.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 import mock
-import oslo.messaging as om
+import oslo_messaging as om
 from watcher.common import exception
 from watcher.common import utils
 from watcher.decision_engine.framework.rpcapi import DecisionEngineAPI