Skip to content

Cherry pick cleanups from #499. #501

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 7 commits into from
Jan 7, 2015
Merged

Cherry pick cleanups from #499. #501

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
690b5d9
Cherry pick cleanups from #499.
tseaver Jan 7, 2015
f299d31
Valet service.
tseaver Jan 7, 2015
e117ca0
Replace most monkeys of implicit environ w/ explicit dataset IDs.
tseaver Jan 7, 2015
eead3e1
Use correct Sphinx role.
tseaver Jan 7, 2015
6a87fba
Use 'ID' instead of 'id' consistently in docstrings.
tseaver Jan 7, 2015
a87a143
Typo.
tseaver Jan 7, 2015
90829f5
Chixen bonez.
tseaver Jan 7, 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
Chixen bonez.
  • Loading branch information
@tseaver
tseaver committed Jan 7, 2015
commit 90829f5777db997826e473378d2d5358866c3504
18 changes: 8 additions & 10 deletions gcloud/datastore/test_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ def test_ctor_parent(self):
]
parent_key = self._makeOne(_PARENT_KIND, _PARENT_ID,
dataset_id=_PARENT_DATASET,
namespace=_PARENT_NAMESPACE,
)
namespace=_PARENT_NAMESPACE)
key = self._makeOne(_CHILD_KIND, _CHILD_ID, parent=parent_key)
self.assertEqual(key.dataset_id, parent_key.dataset_id)
self.assertEqual(key.namespace, parent_key.namespace)
Expand All @@ -97,7 +96,7 @@ def test_ctor_parent_bad_type(self):

def test_ctor_parent_bad_namespace(self):
parent_key = self._makeOne('KIND', 1234, namespace='FOO',
dataset_id=self._DEFAULT_DATASET)
dataset_id=self._DEFAULT_DATASET)
with self.assertRaises(ValueError):
self._makeOne('KIND2', 1234, namespace='BAR', parent=parent_key,
dataset_id=self._DEFAULT_DATASET)
Expand Down Expand Up @@ -128,17 +127,16 @@ def test_ctor_explicit(self):
self.assertEqual(key.path, _PATH)

def test_ctor_bad_kind(self):
self.assertRaises(ValueError,
self._makeOne, object(), dataset_id=self._DEFAULT_DATASET)
self.assertRaises(ValueError, self._makeOne, object(),
dataset_id=self._DEFAULT_DATASET)

def test_ctor_bad_id_or_name(self):
self.assertRaises(ValueError, self._makeOne, 'KIND', object(),
dataset_id=self._DEFAULT_DATASET)
dataset_id=self._DEFAULT_DATASET)
self.assertRaises(ValueError, self._makeOne, 'KIND', None,
dataset_id=self._DEFAULT_DATASET)
self.assertRaises(ValueError,
self._makeOne, 'KIND', 10, 'KIND2', None,
dataset_id=self._DEFAULT_DATASET)
dataset_id=self._DEFAULT_DATASET)
self.assertRaises(ValueError, self._makeOne, 'KIND', 10, 'KIND2', None,
dataset_id=self._DEFAULT_DATASET)

def test__clone(self):
_DATASET = 'DATASET-ALT'
Expand Down