openstack/deb-python-ceilometerclient
Code Issues Proposed changes

Merge "Correct the usage of the method assertEqual()"

Browse Source
This commit is contained in:
Jenkins
2016-05-20 02:28:42 +00:00
committed by Gerrit Code Review
parent c8187cb579 87c30d90a7
commit c00152ca3e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ceilometerclient/tests/unit/v2/test_events.py
View File

@@ -135,10 +135,10 @@ class EventManagerTest(utils.BaseTestCase):
'GET', '/v2/events' 'GET', '/v2/events'
] ]
self.http_client.assert_called(*expect) self.http_client.assert_called(*expect)
self.assertEqual(len(events), 3) self.assertEqual(3, len(events))
self.assertEqual(events[0].event_type, 'Foo') self.assertEqual('Foo', events[0].event_type)
self.assertEqual(events[1].event_type, 'Foo') self.assertEqual('Foo', events[1].event_type)
self.assertEqual(events[2].event_type, 'Bar') self.assertEqual('Bar', events[2].event_type)
def test_list_one(self): def test_list_one(self):
event = self.mgr.get(2) event = self.mgr.get(2)
@@ -147,7 +147,7 @@ class EventManagerTest(utils.BaseTestCase):
] ]
self.http_client.assert_called(*expect) self.http_client.assert_called(*expect)
self.assertIsNotNone(event) self.assertIsNotNone(event)
self.assertEqual(event.event_type, 'Foo') self.assertEqual('Foo', event.event_type)
def test_list_with_query(self): def test_list_with_query(self):
events = list(self.mgr.list(q=[{"field": "hostname", events = list(self.mgr.list(q=[{"field": "hostname",
@@ -158,8 +158,8 @@ class EventManagerTest(utils.BaseTestCase):
'&q.value=localhost' '&q.value=localhost'
] ]
self.http_client.assert_called(*expect) self.http_client.assert_called(*expect)
self.assertEqual(len(events), 2) self.assertEqual(2, len(events))
self.assertEqual(events[0].event_type, 'Foo') self.assertEqual('Foo', events[0].event_type)
def test_list_with_query_no_type(self): def test_list_with_query_no_type(self):
events = list(self.mgr.list(q=[{"field": "hostname", events = list(self.mgr.list(q=[{"field": "hostname",
@@ -169,8 +169,8 @@ class EventManagerTest(utils.BaseTestCase):
'&q.type=&q.value=foreignhost' '&q.type=&q.value=foreignhost'
] ]
self.http_client.assert_called(*expect) self.http_client.assert_called(*expect)
self.assertEqual(len(events), 2) self.assertEqual(2, len(events))
self.assertEqual(events[0].event_type, 'Foo') self.assertEqual('Foo', events[0].event_type)
def test_list_with_multiple_filters(self): def test_list_with_multiple_filters(self):
events = list(self.mgr.list(q=[{"field": "hostname", events = list(self.mgr.list(q=[{"field": "hostname",
@@ -184,7 +184,7 @@ class EventManagerTest(utils.BaseTestCase):
'&q.type=&q.type=integer&q.value=localhost&q.value=5' '&q.type=&q.type=integer&q.value=localhost&q.value=5'
] ]
self.http_client.assert_called(*expect) self.http_client.assert_called(*expect)
self.assertEqual(len(events), 1) self.assertEqual(1, len(events))
def test_get_from_event_class(self): def test_get_from_event_class(self):
event = self.mgr.get(2) event = self.mgr.get(2)