Skip to content
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

Raising exception when dataset ID can't be implied in set_default... #610

Merged
merged 1 commit into from
Feb 12, 2015
Merged

Raising exception when dataset ID can't be implied in set_default... #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions gcloud/datastore/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ def set_default_dataset_id(dataset_id=None):

:type dataset_id: string
:param dataset_id: Optional. The dataset ID to use as default.

:raises: :class:`EnvironmentError` if no dataset ID was implied.
"""
if dataset_id is None:
dataset_id = os.getenv(_DATASET_ENV_VAR_NAME)
Expand All @@ -92,6 +94,8 @@ def set_default_dataset_id(dataset_id=None):

if dataset_id is not None:
_implicit_environ.DATASET_ID = dataset_id
else:
raise EnvironmentError('No dataset ID could be inferred.')


def set_default_connection(connection=None):
Expand Down
9 changes: 6 additions & 3 deletions gcloud/datastore/test___init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def test_no_env_var_set(self):

with self._monkeyEnviron(None):
with self._monkeyImplicit():
self._callFUT()
self.assertRaises(EnvironmentError, self._callFUT)

self.assertEqual(_implicit_environ.DATASET_ID, None)

Expand Down Expand Up @@ -98,7 +98,7 @@ def test_set_explicit_None_wo_env_var_set(self):

with self._monkeyEnviron(None):
with self._monkeyImplicit():
self._callFUT(None)
self.assertRaises(EnvironmentError, self._callFUT, None)

self.assertEqual(_implicit_environ.DATASET_ID, None)

Expand Down Expand Up @@ -152,7 +152,10 @@ def _implicit_compute_engine_helper(self, status):

with self._monkeyEnviron(None):
with self._monkeyImplicit(connection=connection):
self._callFUT()
if EXPECTED_ID is None:
self.assertRaises(EnvironmentError, self._callFUT)
else:
self._callFUT()

self.assertEqual(_implicit_environ.DATASET_ID, EXPECTED_ID)
self.assertEqual(connection.host, '169.254.169.254')
Expand Down