p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #27095 -- Fixed test_contained_by_including_F_object when run in reverse. 

Tests should not rely on auto PKs.

Test regression in 33403bf80f.
This commit is contained in:
Mariusz Felisiak 2020-12-03 09:30:33 +01:00 committed by GitHub
parent 48b4bae983
commit d746f28949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/postgres_tests/migrations/0002_create_test_models.py
View File

@ -99,6 +99,7 @@ class Migration(migrations.Migration):
'field_nested', 'field_nested',
ArrayField(ArrayField(models.IntegerField(), size=None, null=True), size=None, null=True), ArrayField(ArrayField(models.IntegerField(), size=None, null=True), size=None, null=True),
), ),
('order', models.IntegerField(null=True)),
], ],
options={ options={
'required_db_vendor': 'postgresql', 'required_db_vendor': 'postgresql',

1
tests/postgres_tests/models.py
View File

@ -46,6 +46,7 @@ class IntegerArrayModel(PostgreSQLModel):
class NullableIntegerArrayModel(PostgreSQLModel): class NullableIntegerArrayModel(PostgreSQLModel):
field = ArrayField(models.IntegerField(), blank=True, null=True) field = ArrayField(models.IntegerField(), blank=True, null=True)
field_nested = ArrayField(ArrayField(models.IntegerField(null=True)), null=True) field_nested = ArrayField(ArrayField(models.IntegerField(null=True)), null=True)
order = models.IntegerField(null=True)
class CharArrayModel(PostgreSQLModel): class CharArrayModel(PostgreSQLModel):

12
tests/postgres_tests/test_array.py
View File

@ -205,11 +205,11 @@ class TestQuerying(PostgreSQLTestCase):
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
cls.objs = NullableIntegerArrayModel.objects.bulk_create([ cls.objs = NullableIntegerArrayModel.objects.bulk_create([
NullableIntegerArrayModel(field=[1]), NullableIntegerArrayModel(order=1, field=[1]),
NullableIntegerArrayModel(field=[2]), NullableIntegerArrayModel(order=2, field=[2]),
NullableIntegerArrayModel(field=[2, 3]), NullableIntegerArrayModel(order=3, field=[2, 3]),
NullableIntegerArrayModel(field=[20, 30, 40]), NullableIntegerArrayModel(order=4, field=[20, 30, 40]),
NullableIntegerArrayModel(field=None), NullableIntegerArrayModel(order=5, field=None),
]) ])
def test_empty_list(self): def test_empty_list(self):
@ -304,7 +304,7 @@ class TestQuerying(PostgreSQLTestCase):
def test_contained_by_including_F_object(self): def test_contained_by_including_F_object(self):
self.assertSequenceEqual( self.assertSequenceEqual(
NullableIntegerArrayModel.objects.filter(field__contained_by=[models.F('id'), 2]), NullableIntegerArrayModel.objects.filter(field__contained_by=[models.F('order'), 2]),
self.objs[:3], self.objs[:3],
) )