From 9fc3a74c433d231cae328b8904163ecbcc8747e3 Mon Sep 17 00:00:00 2001 From: Shinya Kawabata Date: Fri, 20 Nov 2015 10:50:59 +0900 Subject: [PATCH] Improve unit test: test_alarm_state_history Make it easy to understand what data returned from InfluxDB and API. See also https://review.openstack.org/#/c/246329/ . Change-Id: I39c171ba987f187d12f532c16e039d98dce463aa --- monasca_api/tests/test_alarms.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/monasca_api/tests/test_alarms.py b/monasca_api/tests/test_alarms.py index 6e61199f3..2c9d2c95a 100644 --- a/monasca_api/tests/test_alarms.py +++ b/monasca_api/tests/test_alarms.py @@ -67,6 +67,9 @@ ALARM_HISTORY = OrderedDict(( u"sub_alarm_state": u"ALARM", u"current_values": [50.1], }]), + # Only present in data returned from InfluxDB: + (u"tenant_id", TENANT_ID), + # Only present in data returned from API: (u"id", u"1420070400000"), )) @@ -117,7 +120,6 @@ class InfluxClientAlarmHistoryResponseFixture(fixtures.MockPatch): del mock_data[u"sub_alarms"][0][u"sub_alarm_expression"][u"dimensions"] mock_data[u"sub_alarms"] = json.dumps(mock_data[u"sub_alarms"]) mock_data[u"metrics"] = json.dumps(mock_data[u"metrics"]) - mock_data[u"tenant_id"] = TENANT_ID self.mock.return_value.query.return_value.raw = { "series": [self._build_series("alarm_state_history", mock_data)] @@ -180,6 +182,7 @@ class TestAlarmsStateHistory(AlarmTestBase): expected_elements = {u"elements": [dict(ALARM_HISTORY)]} del expected_elements[u"elements"][0][u"time"] del expected_elements[u"elements"][0][u"sub_alarms"][0][u"sub_alarm_expression"][u"metric_definition"] + del expected_elements[u"elements"][0][u"tenant_id"] response = self.simulate_request( u'/v2.0/alarms/%s/state-history/' % ALARM_HISTORY[u"alarm_id"],