Skip to content

Add implicit environment support to pubsub #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 3 commits into from
Mar 27, 2015
Merged

Add implicit environment support to pubsub #763

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44aa3ce
Initial pubsub support for implicit connection / project.
tseaver Mar 26, 2015
b48e262
Add implicit connection/project support to API lookup functions.
tseaver Mar 26, 2015
96b5925
Add implicit connection/project support to Topic ctor.
tseaver Mar 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add implicit connection/project support to Topic ctor.
  • Loading branch information
@tseaver
tseaver committed Mar 26, 2015
commit 96b5925dc3827a3aebd8b6ef70464cb274e4f510
12 changes: 9 additions & 3 deletions gcloud/pubsub/test_topic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@ def _makeOne(self, *args, **kw):
return self._getTargetClass()(*args, **kw)

def test_ctor_wo_inferred_project_or_connection(self):
from gcloud._testing import _monkey_defaults as _monkey_base_defaults
from gcloud.pubsub._testing import _monkey_defaults
TOPIC_NAME = 'topic_name'
topic = self._makeOne(TOPIC_NAME)
PROJECT = 'PROJECT'
conn = _Connection()
with _monkey_base_defaults(project=PROJECT):
with _monkey_defaults(connection=conn):
topic = self._makeOne(TOPIC_NAME)
self.assertEqual(topic.name, TOPIC_NAME)
self.assertEqual(topic.project, None)
self.assertEqual(topic.connection, None)
self.assertEqual(topic.project, PROJECT)
self.assertTrue(topic.connection is conn)

def test_ctor_w_explicit_project_and_connection(self):
TOPIC_NAME = 'topic_name'
Expand Down
6 changes: 6 additions & 0 deletions gcloud/pubsub/topic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

import base64

from gcloud._helpers import get_default_project
from gcloud.exceptions import NotFound
from gcloud.pubsub._implicit_environ import get_default_connection


class Topic(object):
Expand All @@ -40,6 +42,10 @@ class Topic(object):
environment.
"""
def __init__(self, name, project=None, connection=None):
if project is None:
project = get_default_project()
if connection is None:
connection = get_default_connection()
self.name = name
self.project = project
self.connection = connection
Expand Down