Add system test for 'subscription w/ deleted topic' case.

tseaver · tseaver · commit 4dbdb750e425 · 2016-04-04T13:48:33.000-04:00
Fix bug in 'Subscription._require_client' exposed thereby.
diff --git a/gcloud/pubsub/subscription.py b/gcloud/pubsub/subscription.py
@@ -130,7 +130,7 @@ def _require_client(self, client):
         :returns: The client passed in or the currently bound client.
         """
         if client is None:
-            client = self.topic._client
+            client = self._client
         return client
 
     def create(self, client=None):
diff --git a/system_tests/pubsub.py b/system_tests/pubsub.py
@@ -207,3 +207,25 @@ def test_subscription_iam_policy(self):
         policy.viewers.add(policy.user('jjg@google.com'))
         new_policy = subscription.set_iam_policy(policy)
         self.assertEqual(new_policy.viewers, policy.viewers)
+
+    def test_fetch_delete_subscription_w_deleted_topic(self):
+        TO_DELETE = 'delete-me-%d' % (1000 * time.time(),)
+        ORPHANED = 'orphaned-%d' % (1000 * time.time(),)
+        topic = Config.CLIENT.topic(TO_DELETE)
+        topic.create()
+        subscription = topic.subscription(ORPHANED)
+        subscription.create()
+        topic.delete()
+
+        all_subs = []
+        token = None
+        while True:
+            subs, token = Config.CLIENT.list_subscriptions(page_token=token)
+            all_subs.extend(subs)
+            if token is None:
+                break
+
+        created = [subscription for subscription in all_subs
+                   if subscription.name == ORPHANED]
+        self.assertEqual(len(created), 1)
+        created[0].delete()
