From c28bf990d71a8befb954482e3d6a925e89f3176f Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 18 Nov 2017 14:22:15 +0100 Subject: Refs #29548 -- Fixed GIS tests on MariaDB --- tests/gis_tests/inspectapp/tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/gis_tests/inspectapp/tests.py b/tests/gis_tests/inspectapp/tests.py index f499bbdbe0..a57bfcabbd 100644 --- a/tests/gis_tests/inspectapp/tests.py +++ b/tests/gis_tests/inspectapp/tests.py @@ -141,8 +141,10 @@ class OGRInspectTest(TestCase): else: self.assertIn(' f_decimal = models.DecimalField(max_digits=0, decimal_places=0)', model_def) self.assertIn(' f_int = models.IntegerField()', model_def) - self.assertIn(' f_datetime = models.DateTimeField()', model_def) - self.assertIn(' f_time = models.TimeField()', model_def) + if connection.vendor != 'mysql' or not connection.mysql_is_mariadb: + # Probably a bug between GDAL and MariaDB on time fields. + self.assertIn(' f_datetime = models.DateTimeField()', model_def) + self.assertIn(' f_time = models.TimeField()', model_def) if connection.vendor == 'sqlite': self.assertIn(' f_float = models.CharField(max_length=0)', model_def) else: -- cgit v1.3