summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/model_fields/tests.py14
-rw-r--r--tests/model_inheritance_regress/tests.py4
2 files changed, 15 insertions, 3 deletions
diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
index eaf84773e3..d3b1e4b868 100644
--- a/tests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -6,7 +6,7 @@ from decimal import Decimal
from django import test
from django import forms
from django.core.exceptions import ValidationError
-from django.db import models
+from django.db import models, IntegrityError
from django.db.models.fields.files import FieldFile
from django.utils import six
from django.utils import unittest
@@ -265,6 +265,18 @@ class BooleanFieldTests(unittest.TestCase):
self.assertEqual(mc.bf.bfield, False)
self.assertEqual(mc.nbf.nbfield, False)
+ def test_null_default(self):
+ """
+ Check that a BooleanField defaults to None -- which isn't
+ a valid value (#15124).
+ """
+ b = BooleanModel()
+ self.assertIsNone(b.bfield)
+ with self.assertRaises(IntegrityError):
+ b.save()
+ nb = NullBooleanModel()
+ self.assertIsNone(nb.nbfield)
+ nb.save() # no error
class ChoicesTests(test.TestCase):
def test_choices_and_field_display(self):
diff --git a/tests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py
index 98216dbc84..c2c9337485 100644
--- a/tests/model_inheritance_regress/tests.py
+++ b/tests/model_inheritance_regress/tests.py
@@ -181,11 +181,11 @@ class ModelInheritanceTest(TestCase):
"""
Regression test for #6755
"""
- r = Restaurant(serves_pizza=False)
+ r = Restaurant(serves_pizza=False, serves_hot_dogs=False)
r.save()
self.assertEqual(r.id, r.place_ptr_id)
orig_id = r.id
- r = Restaurant(place_ptr_id=orig_id, serves_pizza=True)
+ r = Restaurant(place_ptr_id=orig_id, serves_pizza=True, serves_hot_dogs=False)
r.save()
self.assertEqual(r.id, orig_id)
self.assertEqual(r.id, r.place_ptr_id)