Remove now-redundant mock connections.

Addresses:
#1736 (comment)

Author: tseaver

gcloud/pubsub/test_client.py

@@ -33,7 +33,7 @@ def test_publisher_api(self):
         from gcloud.pubsub.connection import _PublisherAPI
         creds = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=creds)
-        conn = client.connection = _Connection()
+        conn = client.connection = object()
         api = client.publisher_api
         self.assertIsInstance(api, _PublisherAPI)
         self.assertTrue(api._connection is conn)
@@ -45,7 +45,7 @@ def test_subscriber_api(self):
         from gcloud.pubsub.connection import _SubscriberAPI
         creds = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=creds)
-        conn = client.connection = _Connection()
+        conn = client.connection = object()
         api = client.subscriber_api
         self.assertIsInstance(api, _SubscriberAPI)
         self.assertTrue(api._connection is conn)
@@ -57,7 +57,7 @@ def test_iam_policy_api(self):
         from gcloud.pubsub.connection import _IAMPolicyAPI
         creds = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=creds)
-        conn = client.connection = _Connection()
+        conn = client.connection = object()
         api = client.iam_policy_api
         self.assertIsInstance(api, _IAMPolicyAPI)
         self.assertTrue(api._connection is conn)
@@ -69,7 +69,7 @@ def test_list_topics_no_paging(self):
         from gcloud.pubsub.topic import Topic
         creds = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=creds)
-        conn = client.connection = _Connection()
+        client.connection = object()
         api = client._publisher_api = _FauxPublisherAPI()
         api._list_topics_response = [{'name': self.TOPIC_PATH}], None
 
@@ -80,7 +80,6 @@ def test_list_topics_no_paging(self):
         self.assertEqual(topics[0].name, self.TOPIC_NAME)
         self.assertEqual(next_page_token, None)
 
-        self.assertEqual(len(conn._requested), 0)
         self.assertEqual(api._listed_topics, (self.PROJECT, None, None))
 
     def test_list_topics_with_paging(self):
@@ -90,7 +89,7 @@ def test_list_topics_with_paging(self):
         SIZE = 1
         creds = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=creds)
-        conn = client.connection = _Connection()
+        client.connection = object()
         api = client._publisher_api = _FauxPublisherAPI()
         api._list_topics_response = [{'name': self.TOPIC_PATH}], TOKEN2
 
@@ -101,13 +100,12 @@ def test_list_topics_with_paging(self):
         self.assertEqual(topics[0].name, self.TOPIC_NAME)
         self.assertEqual(next_page_token, TOKEN2)
 
-        self.assertEqual(len(conn._requested), 0)
         self.assertEqual(api._listed_topics, (self.PROJECT, 1, TOKEN1))
 
     def test_list_topics_missing_key(self):
         creds = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=creds)
-        conn = client.connection = _Connection()
+        client.connection = object()
         api = client._publisher_api = _FauxPublisherAPI()
         api._list_topics_response = (), None
 
@@ -116,15 +114,14 @@ def test_list_topics_missing_key(self):
         self.assertEqual(len(topics), 0)
         self.assertEqual(next_page_token, None)
 
-        self.assertEqual(len(conn._requested), 0)
         self.assertEqual(api._listed_topics, (self.PROJECT, None, None))
 
     def test_list_subscriptions_no_paging(self):
         from gcloud.pubsub.subscription import Subscription
         SUB_INFO = {'name': self.SUB_PATH, 'topic': self.TOPIC_PATH}
         creds = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=creds)
-        conn = client.connection = _Connection()
+        client.connection = object()
         api = client._subscriber_api = _FauxSubscriberAPI()
         api._list_subscriptions_response = [SUB_INFO], None
 
@@ -136,7 +133,6 @@ def test_list_subscriptions_no_paging(self):
         self.assertEqual(subscriptions[0].topic.name, self.TOPIC_NAME)
         self.assertEqual(next_page_token, None)
 
-        self.assertEqual(len(conn._requested), 0)
         self.assertEqual(api._listed_subscriptions,
                          (self.PROJECT, None, None))
 
@@ -154,7 +150,7 @@ def test_list_subscriptions_with_paging(self):
         TOKEN1 = 'TOKEN1'
         TOKEN2 = 'TOKEN2'
         SIZE = 1
-        conn = client.connection = _Connection()
+        client.connection = object()
         api = client._subscriber_api = _FauxSubscriberAPI()
         api._list_subscriptions_response = [SUB_INFO], TOKEN2
 
@@ -169,7 +165,6 @@ def test_list_subscriptions_with_paging(self):
         self.assertEqual(subscriptions[0].push_endpoint, PUSH_ENDPOINT)
         self.assertEqual(next_page_token, TOKEN2)
 
-        self.assertEqual(len(conn._requested), 0)
         self.assertEqual(api._listed_subscriptions,
                          (self.PROJECT, SIZE, TOKEN1))
 
@@ -178,7 +173,7 @@ def test_list_subscriptions_w_missing_key(self):
         creds = _Credentials()
 
         client = self._makeOne(project=PROJECT, credentials=creds)
-        conn = client.connection = _Connection()
+        client.connection = object()
         api = client._subscriber_api = _FauxSubscriberAPI()
         api._list_subscriptions_response = (), None
 
@@ -187,7 +182,6 @@ def test_list_subscriptions_w_missing_key(self):
         self.assertEqual(len(subscriptions), 0)
         self.assertEqual(next_page_token, None)
 
-        self.assertEqual(len(conn._requested), 0)
         self.assertEqual(api._listed_subscriptions,
                          (self.PROJECT, None, None))
 
@@ -231,10 +225,3 @@ class _FauxSubscriberAPI(object):
     def list_subscriptions(self, project, page_size, page_token):
         self._listed_subscriptions = (project, page_size, page_token)
         return self._list_subscriptions_response
-
-
-class _Connection(object):
-
-    def __init__(self, *responses):
-        self._responses = responses
-        self._requested = []