Merge "[MON] Fixes notifier bug during alarm triggering"

[osm/MON.git] / osm_mon / test / OpenStack / unit / test_notifier.py

diff --git a/osm_mon/test/OpenStack/unit/test_notifier.py b/osm_mon/test/OpenStack/unit/test_notifier.py
index 951bf10..e2695d4 100644 (file)
--- a/osm_mon/test/OpenStack/unit/test_notifier.py
+++ b/osm_mon/test/OpenStack/unit/test_notifier.py
@@ -52,7 +52,7 @@ class Response(object):
 
 class RFile():
     def read(self, content_length):
-        return post_data
+        return json.dumps(post_data, sort_keys=True)
 
 
 class MockNotifierHandler(NotifierHandler):
@@ -98,9 +98,9 @@ class TestNotifier(unittest.TestCase):
         self.handler.do_POST()
 
         set_head.assert_called_once()
-        notify.assert_called_with(json.dumps(post_data))
+        notify.assert_called_with(post_data)
 
-    @mock.patch.object(KafkaProducer, "notify_alarm")
+    @mock.patch.object(KafkaProducer, "publish_alarm_response")
     @mock.patch.object(DatabaseManager, "get_alarm")
     def test_notify_alarm_valid_alarm(
             self, get_alarm, notify):
@@ -116,7 +116,7 @@ class TestNotifier(unittest.TestCase):
 
         notify.assert_called_with("notify_alarm", mock.ANY)
 
-    @mock.patch.object(KafkaProducer, "notify_alarm")
+    @mock.patch.object(KafkaProducer, "publish_alarm_response")
     @mock.patch.object(DatabaseManager, "get_alarm")
     def test_notify_alarm_invalid_alarm(
             self, get_alarm, notify):