fix: listing queue fails when detailed=True

Change-Id: Ibda6bf0ee500b1e21893c1433bf3b839af1cef22
Partially-Closes-Bug: 1234481

marconi/proxy/transport/wsgi/queues.py

@@ -58,18 +58,18 @@ def on_get(self, request, response):
         request.get_param_as_bool('detailed', store=kwargs)
 
         resp = collections.defaultdict(list)
-        for q in self._catalogue.list(project):
-            queue = q['name']
-            if queue < kwargs.get('marker', ''):
+        for queue in self._catalogue.list(project):
+            queue_name = queue['name']
+            if queue_name < kwargs.get('marker', ''):
                 continue
             entry = {
-                'href': request.path + '/' + queue,
-                'name': queue
+                'href': request.path + '/' + queue_name,
+                'name': queue_name
             }
             if kwargs.get('detailed', None):
                 entry['metadata'] = queue['metadata']
             resp['queues'].append(entry)
-            kwargs['marker'] = queue
+            kwargs['marker'] = queue_name
             if len(resp['queues']) == kwargs.get('limit', 0):
                 break
 

tests/unit/proxy/test_queues.py

@@ -119,6 +119,19 @@ def test_list_queues_with_no_queues_204s(self):
         self.simulate_get('/v1/queues')
         self.assertEquals(self.srmock.status, falcon.HTTP_204)
 
+    # An incomplete test, only for Bug #1234481
+    # TODO(zyuan): tearDown the queue creation
+    def test_list_queues_with_option_detailed(self):
+        self._mock_create_queue('/v1/queues/q1', status=201)
+        self._mock_create_queue('/v1/queues/q2', status=201)
+
+        result = self.simulate_get('/v1/queues', query_string="?detailed=True")
+        self.assertEquals(self.srmock.status, falcon.HTTP_200)
+
+        doc = json.loads(result[0])
+        for entry in doc['queues']:
+            self.assertIn('metadata', entry)
+
 
 @ddt.ddt
 class QueuesWithNoPartitionsTest(base.TestBase):