Skip to content

Commit

Permalink
Fixing merge conflicts that re-introduced dataset ID.
Browse files Browse the repository at this point in the history
  • Loading branch information
dhermes committed Jan 7, 2016
1 parent f55984d commit d5b313f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions gcloud/datastore/test_entity.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test___eq_____ne___w_same_keys(self):
entity1[name] = value
entity1._meanings[name] = (meaning, value)

key2 = Key(_KIND, _ID, project_PROJECT)
key2 = Key(_KIND, _ID, project=_PROJECT)
entity2 = self._makeOne(key=key2, exclude_from_indexes=(name,))
entity2[name] = value
entity2._meanings[name] = (meaning, value)
Expand Down Expand Up @@ -156,7 +156,7 @@ def test__eq__same_value_different_exclude(self):

name = 'foo'
value = 42
key = Key(_KIND, _ID, dataset_id=_DATASET_ID)
key = Key(_KIND, _ID, project=_PROJECT)

entity1 = self._makeOne(key=key, exclude_from_indexes=(name,))
entity1[name] = value
Expand All @@ -172,7 +172,7 @@ def test__eq__same_value_different_meanings(self):
name = 'foo'
value = 42
meaning = 9
key = Key(_KIND, _ID, dataset_id=_DATASET_ID)
key = Key(_KIND, _ID, project=_PROJECT)

entity1 = self._makeOne(key=key, exclude_from_indexes=(name,))
entity1[name] = value
Expand Down

0 comments on commit d5b313f

Please sign in to comment.