Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d1bcb86

Browse filesBrowse files
committed
Fixing merge conflicts that re-introduced dataset ID.
1 parent 38e0209 commit d1bcb86
Copy full SHA for d1bcb86

File tree

Expand file treeCollapse file tree

1 file changed

+3
-3
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+3
-3
lines changed

‎gcloud/datastore/test_entity.py

Copy file name to clipboardExpand all lines: gcloud/datastore/test_entity.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test___eq_____ne___w_same_keys(self):
8080
entity1[name] = value
8181
entity1._meanings[name] = (meaning, value)
8282

83-
key2 = Key(_KIND, _ID, project_PROJECT)
83+
key2 = Key(_KIND, _ID, project=_PROJECT)
8484
entity2 = self._makeOne(key=key2, exclude_from_indexes=(name,))
8585
entity2[name] = value
8686
entity2._meanings[name] = (meaning, value)
@@ -156,7 +156,7 @@ def test__eq__same_value_different_exclude(self):
156156

157157
name = 'foo'
158158
value = 42
159-
key = Key(_KIND, _ID, dataset_id=_DATASET_ID)
159+
key = Key(_KIND, _ID, project=_PROJECT)
160160

161161
entity1 = self._makeOne(key=key, exclude_from_indexes=(name,))
162162
entity1[name] = value
@@ -172,7 +172,7 @@ def test__eq__same_value_different_meanings(self):
172172
name = 'foo'
173173
value = 42
174174
meaning = 9
175-
key = Key(_KIND, _ID, dataset_id=_DATASET_ID)
175+
key = Key(_KIND, _ID, project=_PROJECT)
176176

177177
entity1 = self._makeOne(key=key, exclude_from_indexes=(name,))
178178
entity1[name] = value

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.