summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/foreign_object/models/empty_join.py4
-rw-r--r--tests/model_fields/test_field_flags.py4
-rw-r--r--tests/model_meta/results.py2
-rw-r--r--tests/model_meta/tests.py8
4 files changed, 9 insertions, 9 deletions
diff --git a/tests/foreign_object/models/empty_join.py b/tests/foreign_object/models/empty_join.py
index b8b05ea1c2..61ac5e35a4 100644
--- a/tests/foreign_object/models/empty_join.py
+++ b/tests/foreign_object/models/empty_join.py
@@ -64,8 +64,8 @@ class StartsWithRelation(models.ForeignObject):
from_opts = self.remote_field.model._meta
return [PathInfo(from_opts, to_opts, (to_opts.pk,), self.remote_field, False, False)]
- def contribute_to_class(self, cls, name, virtual_only=False):
- super(StartsWithRelation, self).contribute_to_class(cls, name, virtual_only)
+ def contribute_to_class(self, cls, name, private_only=False):
+ super(StartsWithRelation, self).contribute_to_class(cls, name, private_only)
setattr(cls, self.name, ReverseManyToOneDescriptor(self))
diff --git a/tests/model_fields/test_field_flags.py b/tests/model_fields/test_field_flags.py
index 33f49a139d..ff6f595e27 100644
--- a/tests/model_fields/test_field_flags.py
+++ b/tests/model_fields/test_field_flags.py
@@ -78,13 +78,13 @@ class FieldFlagsTests(test.SimpleTestCase):
super(FieldFlagsTests, cls).setUpClass()
cls.fields = (
list(AllFieldsModel._meta.fields) +
- list(AllFieldsModel._meta.virtual_fields)
+ list(AllFieldsModel._meta.private_fields)
)
cls.all_fields = (
cls.fields +
list(AllFieldsModel._meta.many_to_many) +
- list(AllFieldsModel._meta.virtual_fields)
+ list(AllFieldsModel._meta.private_fields)
)
cls.fields_and_reverse_objects = (
diff --git a/tests/model_meta/results.py b/tests/model_meta/results.py
index 50cb59a169..db8ccf650e 100644
--- a/tests/model_meta/results.py
+++ b/tests/model_meta/results.py
@@ -863,7 +863,7 @@ TEST_RESULTS = {
'm2m_concrete_rel',
],
},
- 'virtual_fields': {
+ 'private_fields': {
AbstractPerson: [
'generic_relation_abstract',
'content_object_abstract',
diff --git a/tests/model_meta/tests.py b/tests/model_meta/tests.py
index d662c8257c..9a692ffdd2 100644
--- a/tests/model_meta/tests.py
+++ b/tests/model_meta/tests.py
@@ -157,11 +157,11 @@ class RelatedObjectsTests(OptionsBaseTests):
)
-class VirtualFieldsTests(OptionsBaseTests):
+class PrivateFieldsTests(OptionsBaseTests):
- def test_virtual_fields(self):
- for model, expected_names in TEST_RESULTS['virtual_fields'].items():
- objects = model._meta.virtual_fields
+ def test_private_fields(self):
+ for model, expected_names in TEST_RESULTS['private_fields'].items():
+ objects = model._meta.private_fields
self.assertEqual(sorted([f.name for f in objects]), sorted(expected_names))