From bee17b9633717d853608af89d043fb4a2303134c Mon Sep 17 00:00:00 2001
From: wangxiyuan <wangxiyuan@huawei.com>
Date: Mon, 15 Feb 2016 09:28:19 +0800
Subject: [PATCH] Don't return links if subscriptions are empty

The commit I08dd0f675bcd25cd63e17a0aa9779895bd401e32 try to fix
the links format when a queue's subscriptions are empty. But it
doesn't work. Because the "results" which storage returns will
never be None.

This patch fix the nit and also add a test to ensure it works.

Change-Id: Ib7fb0b6bfccc5e913ff618257f07903f692201f1
---
 .../unit/transport/wsgi/v2_0/test_subscriptions.py  | 13 +++++++++++++
 zaqar/transport/wsgi/v2_0/subscriptions.py          |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py
index c17579c8e..bf7fd4c0f 100644
--- a/zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py
+++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py
@@ -176,6 +176,19 @@ class TestSubscriptionsMongoDB(base.V2Base):
     def test_list_works(self):
         self._list_subscription()
 
+    def test_list_empty(self):
+        resp = self.simulate_get(self.subscription_path,
+                                 headers=self.headers)
+
+        self.assertEqual(falcon.HTTP_200, self.srmock.status)
+
+        resp_doc = jsonutils.loads(resp[0])
+        self.assertIsInstance(resp_doc, dict)
+        self.assertIn('subscriptions', resp_doc)
+        self.assertIn('links', resp_doc)
+        self.assertEqual([], resp_doc['subscriptions'])
+        self.assertEqual([], resp_doc['links'])
+
     @ddt.data(1, 5, 10, 15)
     def test_listing_works_with_limit(self, limit):
         self._list_subscription(count=15, limit=limit)
diff --git a/zaqar/transport/wsgi/v2_0/subscriptions.py b/zaqar/transport/wsgi/v2_0/subscriptions.py
index 85b859755..6955b4a4f 100644
--- a/zaqar/transport/wsgi/v2_0/subscriptions.py
+++ b/zaqar/transport/wsgi/v2_0/subscriptions.py
@@ -142,7 +142,7 @@ class CollectionResource(object):
         kwargs['marker'] = next(results) or kwargs.get('marker', '')
 
         links = []
-        if results:
+        if subscriptions:
             links = [
                 {
                     'rel': 'next',