Skip more tests on py35 due to dict randomization

tortoise · Aug 20, 2019 · 9d8dc9f · 9d8dc9f
1 parent 81b043a
commit 9d8dc9f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/tortoise/tests/test_describe_model.py b/tortoise/tests/test_describe_model.py
@@ -1,4 +1,5 @@
 import json
+import sys
 
 from tortoise import Tortoise
 from tortoise.contrib import test
@@ -36,6 +37,7 @@ async def test_describe_models_some(self):
             {"models.Event", "models.Tournament", "models.Reporter", "models.Team"}, set(val.keys())
         )
 
+    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_straight(self):
         val = Tortoise.describe_model(StraightFields)
 
@@ -152,6 +154,7 @@ async def test_describe_model_straight(self):
             },
         )
 
+    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_source(self):
         val = Tortoise.describe_model(SourceFields)
 
@@ -268,6 +271,7 @@ async def test_describe_model_source(self):
             },
         )
 
+    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_uuidpk(self):
         val = Tortoise.describe_model(UUIDPkModel)
 
@@ -323,6 +327,7 @@ async def test_describe_model_uuidpk(self):
             },
         )
 
+    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_json(self):
         val = Tortoise.describe_model(JSONFields)
 
@@ -372,6 +377,18 @@ async def test_describe_model_json(self):
                         "default": None,
                         "description": None,
                     },
+                    {
+                        "name": "data_default",
+                        "field_type": "JSONField",
+                        "db_column": "data_default",
+                        "python_type": ["dict", "list"],
+                        "generated": False,
+                        "nullable": False,
+                        "unique": False,
+                        "indexed": False,
+                        "default": "{'a': 1}",
+                        "description": None,
+                    },
                 ],
                 "fk_fields": [],
                 "backward_fk_fields": [],

diff --git a/tortoise/tests/testmodels.py b/tortoise/tests/testmodels.py
@@ -157,6 +157,7 @@ class JSONFields(Model):
     id = fields.IntField(pk=True)
     data = fields.JSONField()
     data_null = fields.JSONField(null=True)
+    data_default = fields.JSONField(default={"a": 1})
 
 
 class UUIDFields(Model):