Skip to content

Commit 0508fb9

Browse files
timgrahamtimgraham
committed
fixes
1 parent 833f623 commit 0508fb9

File tree

5 files changed

+41
-33
lines changed

5 files changed

+41
-33
lines changed

‎tests/admin_widgets/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class Event(models.Model):
108108
main_band = models.ForeignKey(
109109
Band,
110110
models.CASCADE,
111-
limit_choices_to=models.Q(pk__gt=0),
111+
limit_choices_to=models.Q(pk__gt="000000000000000000000000"),
112112
related_name="events_main_band_at",
113113
)
114114
supporting_bands = models.ManyToManyField(

‎tests/admin_widgets/tests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ def test_nonexistent_target_id(self):
331331
post_data = {
332332
"main_band": str(pk),
333333
}
334-
print(post_data)
335334
# Try posting with a nonexistent pk in a raw id field: this
336335
# should result in an error message, not a server exception.
337336
response = self.client.post(reverse("admin:admin_widgets_event_add"), post_data)

‎tests/serializers/test_json.py

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,9 @@ def test_helpful_error_message_for_foreign_keys(self):
140140
Invalid foreign keys with a natural key should throw a helpful error
141141
message, such as what the failing key is.
142142
"""
143+
pk = "000000000000000000000001"
143144
test_string = """[{
144-
"pk": 1,
145+
"pk": "000000000000000000000001",
145146
"model": "serializers.category",
146147
"fields": {
147148
"name": "Unknown foreign key",
@@ -152,37 +153,38 @@ def test_helpful_error_message_for_foreign_keys(self):
152153
}
153154
}]"""
154155
key = ["doesnotexist", "metadata"]
155-
expected = "(serializers.category:pk=1) field_value was '%r'" % key
156+
expected = f"(serializers.category:pk={pk}) field_value was '%r'" % key
156157
with self.assertRaisesMessage(DeserializationError, expected):
157158
list(serializers.deserialize("json", test_string))
158159

159160
def test_helpful_error_message_for_many2many_non_natural(self):
160161
"""
161162
Invalid many-to-many keys should throw a helpful error message.
162163
"""
164+
pk = "000000000000000000000001"
163165
test_string = """[{
164-
"pk": 1,
166+
"pk": "000000000000000000000001",
165167
"model": "serializers.article",
166168
"fields": {
167-
"author": 1,
169+
"author": "000000000000000000000001",
168170
"headline": "Unknown many to many",
169171
"pub_date": "2014-09-15T10:35:00",
170-
"categories": [1, "doesnotexist"]
172+
"categories": ["000000000000000000000001", "doesnotexist"]
171173
}
172174
}, {
173-
"pk": 1,
175+
"pk": "000000000000000000000001",
174176
"model": "serializers.author",
175177
"fields": {
176178
"name": "Agnes"
177179
}
178180
}, {
179-
"pk": 1,
181+
"pk": "000000000000000000000001",
180182
"model": "serializers.category",
181183
"fields": {
182184
"name": "Reference"
183185
}
184186
}]"""
185-
expected = "(serializers.article:pk=1) field_value was 'doesnotexist'"
187+
expected = f"(serializers.article:pk={pk}) field_value was 'doesnotexist'"
186188
with self.assertRaisesMessage(DeserializationError, expected):
187189
list(serializers.deserialize("json", test_string))
188190

@@ -234,31 +236,32 @@ def test_helpful_error_message_for_many2many_natural2(self):
234236
tests the code path where a natural many-to-many key has only a single
235237
value.
236238
"""
239+
pk = "000000000000000000000001"
237240
test_string = """[{
238-
"pk": 1,
241+
"pk": "000000000000000000000001",
239242
"model": "serializers.article",
240243
"fields": {
241-
"author": 1,
244+
"author": "000000000000000000000001",
242245
"headline": "Unknown many to many",
243246
"pub_date": "2014-09-15T10:35:00",
244-
"meta_data": [1, "doesnotexist"]
247+
"meta_data": ["000000000000000000000001", "doesnotexist"]
245248
}
246249
}, {
247-
"pk": 1,
250+
"pk": "000000000000000000000001",
248251
"model": "serializers.categorymetadata",
249252
"fields": {
250253
"kind": "author",
251254
"name": "meta1",
252255
"value": "Agnes"
253256
}
254257
}, {
255-
"pk": 1,
258+
"pk": "000000000000000000000001",
256259
"model": "serializers.author",
257260
"fields": {
258261
"name": "Agnes"
259262
}
260263
}]"""
261-
expected = "(serializers.article:pk=1) field_value was 'doesnotexist'"
264+
expected = f"(serializers.article:pk={pk}) field_value was 'doesnotexist'"
262265
with self.assertRaisesMessage(DeserializationError, expected):
263266
for obj in serializers.deserialize("json", test_string, ignore=False):
264267
obj.save()
@@ -267,13 +270,14 @@ def test_helpful_error_message_for_many2many_not_iterable(self):
267270
"""
268271
Not iterable many-to-many field value throws a helpful error message.
269272
"""
273+
pk = "000000000000000000000001"
270274
test_string = """[{
271-
"pk": 1,
275+
"pk": "000000000000000000000001",
272276
"model": "serializers.m2mdata",
273277
"fields": {"data": null}
274278
}]"""
275279

276-
expected = "(serializers.m2mdata:pk=1) field_value was 'None'"
280+
expected = f"(serializers.m2mdata:pk={pk}) field_value was 'None'"
277281
with self.assertRaisesMessage(DeserializationError, expected):
278282
next(serializers.deserialize("json", test_string, ignore=False))
279283

‎tests/serializers/test_jsonl.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -118,45 +118,47 @@ def test_helpful_error_message_for_foreign_keys(self):
118118
Invalid foreign keys with a natural key throws a helpful error message,
119119
such as what the failing key is.
120120
"""
121+
pk = "000000000000000000000001"
121122
test_string = (
122-
'{"pk": 1, "model": "serializers.category",'
123+
'{"pk": "000000000000000000000001", "model": "serializers.category",'
123124
'"fields": {'
124125
'"name": "Unknown foreign key",'
125126
'"meta_data": ["doesnotexist","metadata"]}}'
126127
)
127128
key = ["doesnotexist", "metadata"]
128-
expected = "(serializers.category:pk=1) field_value was '%r'" % key
129+
expected = f"(serializers.category:pk={pk}) field_value was '%r'" % key
129130
with self.assertRaisesMessage(DeserializationError, expected):
130131
list(serializers.deserialize("jsonl", test_string))
131132

132133
def test_helpful_error_message_for_many2many_non_natural(self):
133134
"""
134135
Invalid many-to-many keys throws a helpful error message.
135136
"""
137+
pk = "000000000000000000000001"
136138
test_strings = [
137139
"""{
138-
"pk": 1,
140+
"pk": "000000000000000000000001",
139141
"model": "serializers.article",
140142
"fields": {
141-
"author": 1,
143+
"author": "000000000000000000000001",
142144
"headline": "Unknown many to many",
143145
"pub_date": "2014-09-15T10:35:00",
144-
"categories": [1, "doesnotexist"]
146+
"categories": ["000000000000000000000001", "doesnotexist"]
145147
}
146148
}""",
147149
"""{
148-
"pk": 1,
150+
"pk": "000000000000000000000001",
149151
"model": "serializers.author",
150152
"fields": {"name": "Agnes"}
151153
}""",
152154
"""{
153-
"pk": 1,
155+
"pk": "000000000000000000000001",
154156
"model": "serializers.category",
155157
"fields": {"name": "Reference"}
156158
}""",
157159
]
158160
test_string = "\n".join([s.replace("\n", "") for s in test_strings])
159-
expected = "(serializers.article:pk=1) field_value was 'doesnotexist'"
161+
expected = f"(serializers.article:pk={pk}) field_value was 'doesnotexist'"
160162
with self.assertRaisesMessage(DeserializationError, expected):
161163
list(serializers.deserialize("jsonl", test_string))
162164

@@ -204,30 +206,31 @@ def test_helpful_error_message_for_many2many_natural2(self):
204206
Invalid many-to-many keys throws a helpful error message where a
205207
natural many-to-many key has only a single value.
206208
"""
209+
pk = "000000000000000000000001"
207210
test_strings = [
208211
"""{
209-
"pk": 1,
212+
"pk": "000000000000000000000001",
210213
"model": "serializers.article",
211214
"fields": {
212-
"author": 1,
215+
"author": "000000000000000000000001",
213216
"headline": "Unknown many to many",
214217
"pub_date": "2014-09-15T10:35:00",
215-
"meta_data": [1, "doesnotexist"]
218+
"meta_data": ["000000000000000000000001", "doesnotexist"]
216219
}
217220
}""",
218221
"""{
219-
"pk": 1,
222+
"pk": "000000000000000000000001",
220223
"model": "serializers.categorymetadata",
221224
"fields": {"kind": "author","name": "meta1","value": "Agnes"}
222225
}""",
223226
"""{
224-
"pk": 1,
227+
"pk": "000000000000000000000001",
225228
"model": "serializers.author",
226229
"fields": {"name": "Agnes"}
227230
}""",
228231
]
229232
test_string = "\n".join([s.replace("\n", "") for s in test_strings])
230-
expected = "(serializers.article:pk=1) field_value was 'doesnotexist'"
233+
expected = f"(serializers.article:pk={pk}) field_value was 'doesnotexist'"
231234
with self.assertRaisesMessage(DeserializationError, expected):
232235
for obj in serializers.deserialize("jsonl", test_string, ignore=False):
233236
obj.save()

‎tests/syndication_tests/tests.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,5 +718,7 @@ def test_get_object(self):
718718
)
719719

720720
def test_get_non_existent_object(self):
721-
response = self.client.get("/syndication/rss2/articles/0/")
721+
response = self.client.get(
722+
"/syndication/rss2/articles/000000000000000000000000/"
723+
)
722724
self.assertEqual(response.status_code, 404)

0 commit comments

Comments
 (0)