Added tests for model field's choices iterator/iterable values.

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/field_deconstruction/tests.py b/tests/field_deconstruction/tests.py
index c78ed62876..3663886708 100644
--- a/tests/field_deconstruction/tests.py
+++ b/tests/field_deconstruction/tests.py
@@ -97,6 +97,21 @@ class FieldDeconstructionTests(SimpleTestCase):
             kwargs, {"choices": [("A", "One"), ("B", "Two")], "max_length": 1}
         )
 
+    def test_choices_iterator(self):
+        field = models.IntegerField(choices=((i, str(i)) for i in range(3)))
+        name, path, args, kwargs = field.deconstruct()
+        self.assertEqual(path, "django.db.models.IntegerField")
+        self.assertEqual(args, [])
+        self.assertEqual(kwargs, {"choices": [(0, "0"), (1, "1"), (2, "2")]})
+
+    def test_choices_iterable(self):
+        # Pass an iterator (but not an iterable) to choices.
+        field = models.IntegerField(choices="012345")
+        name, path, args, kwargs = field.deconstruct()
+        self.assertEqual(path, "django.db.models.IntegerField")
+        self.assertEqual(args, [])
+        self.assertEqual(kwargs, {"choices": ["0", "1", "2", "3", "4", "5"]})
+
     def test_csi_field(self):
         field = models.CommaSeparatedIntegerField(max_length=100)
         name, path, args, kwargs = field.deconstruct()