Fixed unit tests broken due to recent changes

monasca_events_api/tests/test_events.py

@@ -51,17 +51,16 @@ class EventsSubClass(Events):
             creation_time=timeutils.utcnow_ts())
 
 
-class Test_first(unittest.TestCase):
+class Test_Events(unittest.TestCase):
 
-    @mock.patch('monascaclient.ksclient.KSClient')
-    def _generate_req(self, token):
+    def _generate_req(self):
         """Generate a mock HTTP request"""
         req = mock.MagicMock()
         req.get_param.return_value = None
 
         req.headers = {
             'X-Auth-User': 'mini-mon',
-            'X-Auth-Token': token,
+            'X-Auth-Token': "ABCD",
             'X-Auth-Key': 'password',
             'X-TENANT-ID': '0ab1ac0a-2867-402d',
             'X-ROLES': 'user, domainuser, domainadmin, monasca-user, monasca-agent',
@@ -260,7 +259,7 @@ class Test_first(unittest.TestCase):
         res.status = 0
         try:
             eventsObj.on_post(self._generate_req(), res)
-            assertFalse(
+            self.assertFalse(
                 1,
                 msg="Get Method should fail but succeeded, bad request sent")
         except Exception as e:
@@ -284,7 +283,7 @@ class Test_first(unittest.TestCase):
             validate,
             kafka):
         """POST method with Kafka Down"""
-        kafka.send_message.side_effect = exceptions.MessageQueueException()
+        kafka.send_message_batch.side_effect = exceptions.MessageQueueException()
 
         json.return_value = None
         validate.return_value = True
@@ -298,7 +297,7 @@ class Test_first(unittest.TestCase):
         res.body = {}
         try:
             eventsObj.on_post(self._generate_req(), res)
-            assertFalse(
+            self.assertFalse(
                 1,
                 msg="Kakfa Server Down, Post should fail but succeeded")
         except Exception as e:
@@ -361,7 +360,7 @@ class Test_first(unittest.TestCase):
         res.status = 0
         try:
             eventsObj.on_post(self._generate_req(), res)
-            assertFalse(
+            self.assertFalse(
                 1,
                 msg="Post Method should fail but succeeded, bad request sent")
         except Exception as e:

monasca_events_api/tests/test_stream_definitions.py

@@ -45,15 +45,14 @@ class StreamDefinitionsSubClass(StreamDefinitions):
 
 class Test_StreamDefinitions(unittest.TestCase):
 
-    @mock.patch('monascaclient.ksclient.KSClient')
-    def _generate_req(self, token):
+    def _generate_req(self):
         """Generate a mock HTTP request"""
         req = mock.MagicMock()
         req.get_param.return_value = None
 
         req.headers = {
             'X-Auth-User': 'mini-mon',
-            'X-Auth-Token': token,
+            'X-Auth-Token': 'ABCD',
             'X-Auth-Key': 'password',
             'X-TENANT-ID': '0ab1ac0a-2867-402d',
             'X-ROLES': 'user, domainuser, domainadmin, monasca-user, monasca-agent',

monasca_events_api/tests/test_transforms.py

@@ -35,15 +35,14 @@ class TransformsSubClass(Transforms):
 
 class Test_Transforms(unittest.TestCase):
 
-    @mock.patch('monascaclient.ksclient.KSClient')
-    def _generate_req(self, token):
+    def _generate_req(self):
         """Generate a mock HTTP request"""
         req = mock.MagicMock()
         req.get_param.return_value = None
 
         req.headers = {
             'X-Auth-User': 'mini-mon',
-            'X-Auth-Token': token,
+            'X-Auth-Token': "ABCD",
             'X-Auth-Key': 'password',
             'X-TENANT-ID': '0ab1ac0a-2867-402d',
             'X-ROLES': 'user,  domainuser,  domainadmin,  monasca-user,  monasca-agent',
@@ -246,7 +245,11 @@ class Test_Transforms(unittest.TestCase):
         helpers_validate.return_value = True
         validjson.return_value = True
         validateTransform.return_value = True
-        readhttp.return_value = self._generate_req()
+        readhttp.return_value = {
+            'name': 'Foo',
+            'description': 'transform def',
+            'specification': 'transform spec'}
+
         helper_tenant_id.return_value = '0ab1ac0a-2867-402d'
         generateUUID.return_value = "067e6162-3b6f-4ae2-a171-2470b63dff00"
 

monasca_events_api/v2/transforms.py

@@ -25,6 +25,8 @@ import simport
 
 from monasca_events_api.api import transforms_api_v2
 from monasca_events_api.common.messaging import exceptions as message_queue_exceptions
+from monasca_events_api.common.messaging.message_formats.reference.transforms import (
+    transform as transform_event)
 from monasca_events_api.common.repositories import exceptions as repository_exceptions
 from monasca_events_api.openstack.common import log
 from monasca_events_api.openstack.common import uuidutils
@@ -32,8 +34,6 @@ from monasca_events_api.v2.common import helpers
 from monasca_events_api.v2.common.schemas import (exceptions as schemas_exceptions)
 from monasca_events_api.v2.common.schemas import (
     transforms_request_body_schema as schemas_transforms)
-from monasca_events_api.common.messaging.message_formats.reference.transforms import (
-    transform as transform_event)
 
 
 LOG = log.getLogger(__name__)

tox.ini

@@ -27,6 +27,6 @@ commands = {posargs}
 max-complexity = 50
 max-line-length = 120
 builtins = _
-ignore = F821,H201,H302,H305,H307,H405,H904
+ignore = F821,H201,H302,H305,H307,H405,H904,H402
 exclude=.venv,.git,.tox,dist,*openstack/common*,*egg,build
 show-source = True