diff --git a/openstack_qa_tools/collectors/queues.py b/openstack_qa_tools/collectors/queues.py index 2d87117..c7c1dc7 100644 --- a/openstack_qa_tools/collectors/queues.py +++ b/openstack_qa_tools/collectors/queues.py @@ -53,7 +53,7 @@ def collect(): for q in content: if not isinstance(q, dict): continue - if "name" not in q or "messages" not in q: + if "name" not in q: continue qname = q["name"] if qname.startswith('reply_'): diff --git a/openstack_qa_tools/tests/test_queues.py b/openstack_qa_tools/tests/test_queues.py index e5ab609..a201286 100644 --- a/openstack_qa_tools/tests/test_queues.py +++ b/openstack_qa_tools/tests/test_queues.py @@ -19,6 +19,7 @@ test_collectors Tests for `openstack_qa_tools.collectors` """ +import json import mock from openstack_qa_tools.collectors import queues @@ -30,8 +31,9 @@ class TestOpenStackQaTols(base.TestCase): @mock.patch('six.moves.http_client.HTTPConnection') def test_queues(self, httplib_mock): reader = mock.MagicMock(name='getresponse_reader') - reader.read.return_value = '[]' + rval = json.dumps([{'name': 'foo', 'message_stats': {'publish': 1}}]) + reader.read.return_value = rval conn = httplib_mock.return_value conn.getresponse.return_value = reader data = queues.collect() - self.assertEqual({}, data) + self.assertEqual({'foo_publish': 1}, data)