Updating pubsub regression test for new code.

Author: dhermes

gcloud/pubsub/__init__.py

@@ -23,6 +23,7 @@
   subscription (either pull or push) to a topic.
 """
 
+from gcloud.pubsub.client import Client
 from gcloud.pubsub.connection import SCOPE
 from gcloud.pubsub.subscription import Subscription
 from gcloud.pubsub.topic import Topic

regression/pubsub.py

@@ -19,11 +19,10 @@
 from gcloud import _helpers
 from gcloud import pubsub
 from gcloud.pubsub.subscription import Subscription
-from gcloud.pubsub.topic import Topic
 
 
 _helpers._PROJECT_ENV_VAR_NAME = 'GCLOUD_TESTS_PROJECT_ID'
-pubsub.set_defaults()
+CLIENT = pubsub.Client()
 
 
 class TestPubsub(unittest2.TestCase):
@@ -37,7 +36,7 @@ def tearDown(self):
 
     def test_create_topic(self):
         TOPIC_NAME = 'a-new-topic'
-        topic = Topic(TOPIC_NAME)
+        topic = CLIENT.topic(TOPIC_NAME)
         self.assertFalse(topic.exists())
         topic.create()
         self.to_delete.append(topic)
@@ -51,21 +50,20 @@ def test_list_topics(self):
             'newest%d' % (1000 * time.time(),),
         ]
         for topic_name in topics_to_create:
-            topic = Topic(topic_name)
+            topic = CLIENT.topic(topic_name)
             topic.create()
             self.to_delete.append(topic)
 
         # Retrieve the topics.
-        all_topics, _ = pubsub.list_topics()
-        project = pubsub.get_default_project()
+        all_topics, _ = CLIENT.list_topics()
         created = [topic for topic in all_topics
                    if topic.name in topics_to_create and
-                   topic.project == project]
+                   topic.project == CLIENT.project]
         self.assertEqual(len(created), len(topics_to_create))
 
     def test_create_subscription(self):
         TOPIC_NAME = 'subscribe-me'
-        topic = Topic(TOPIC_NAME)
+        topic = CLIENT.topic(TOPIC_NAME)
         self.assertFalse(topic.exists())
         topic.create()
         self.to_delete.append(topic)
@@ -80,7 +78,7 @@ def test_create_subscription(self):
 
     def test_list_subscriptions(self):
         TOPIC_NAME = 'subscribe-me'
-        topic = Topic(TOPIC_NAME)
+        topic = CLIENT.topic(TOPIC_NAME)
         self.assertFalse(topic.exists())
         topic.create()
         self.to_delete.append(topic)
@@ -95,15 +93,15 @@ def test_list_subscriptions(self):
             self.to_delete.append(subscription)
 
         # Retrieve the subscriptions.
-        all_subscriptions, _ = pubsub.list_subscriptions()
+        all_subscriptions, _ = CLIENT.list_subscriptions()
         created = [subscription for subscription in all_subscriptions
                    if subscription.name in subscriptions_to_create and
                    subscription.topic.name == TOPIC_NAME]
         self.assertEqual(len(created), len(subscriptions_to_create))
 
     def test_message_pull_mode_e2e(self):
         TOPIC_NAME = 'subscribe-me'
-        topic = Topic(TOPIC_NAME, timestamp_messages=True)
+        topic = CLIENT.topic(TOPIC_NAME, timestamp_messages=True)
         self.assertFalse(topic.exists())
         topic.create()
         self.to_delete.append(topic)