summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom <tom@tomforb.es>2018-07-05 21:06:09 +0100
committerTim Graham <timograham@gmail.com>2018-07-06 09:06:08 -0400
commit50e4f9adac2eb14e87570fa8c326fac5d4e0dad5 (patch)
tree72bab43a2750ba941e0a506bd21cb7fe978d9c8b
parent9dd66ba5d52cae27e0c68a55a873c98765568bd8 (diff)
[2.0.x] Refs #29451 -- Fixed test_isvalid_lookup on MySQL 8+.
Backport of f98e1c01eafa724cb87772ae03b3fd1158e9fd50 from master
-rw-r--r--tests/gis_tests/geoapp/tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py
index 2a682c904d..29d8a9c3cc 100644
--- a/tests/gis_tests/geoapp/tests.py
+++ b/tests/gis_tests/geoapp/tests.py
@@ -300,10 +300,10 @@ class GeoLookupTest(TestCase):
invalid_geom = fromstr('POLYGON((0 0, 0 1, 1 1, 1 0, 1 1, 1 0, 0 0))')
State.objects.create(name='invalid', poly=invalid_geom)
qs = State.objects.all()
- if oracle or mysql:
+ if oracle or (mysql and connection.mysql_version < (8, 0, 0)):
# Kansas has adjacent vertices with distance 6.99244813842e-12
# which is smaller than the default Oracle tolerance.
- # It's invalid on MySQL too.
+ # It's invalid on MySQL < 8 also.
qs = qs.exclude(name='Kansas')
self.assertEqual(State.objects.filter(name='Kansas', poly__isvalid=False).count(), 1)
self.assertEqual(qs.filter(poly__isvalid=False).count(), 1)