diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-03-18 11:17:31 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-03-18 11:48:03 +0100 |
| commit | 0963064f48f82567a4db901c67800bba61ba8f49 (patch) | |
| tree | cbd9639a3cc7ff8fd86b890d5d805943109a8e68 | |
| parent | 9c5c437483a41809c94f23274bdaf574e059b6fa (diff) | |
| download | Ishtar-0963064f48f82567a4db901c67800bba61ba8f49.tar.bz2 Ishtar-0963064f48f82567a4db901c67800bba61ba8f49.zip | |
CI: execute gis test first
| -rw-r--r-- | Makefile.example | 3 | ||||
| -rw-r--r-- | archaeological_finds/tests.py | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.example b/Makefile.example index 3330f3dc7..1ac950635 100644 --- a/Makefile.example +++ b/Makefile.example @@ -87,7 +87,8 @@ build_gitlab: clean collectstatic ## specific build for gitlab cd $(project); $(PYTHON) ./manage.py migrate test_gitlab: build_gitlab ## - cd $(project); $(PYTHON) manage.py test $(apps) + cd $(project); $(PYTHON) manage.py test --tag gis $(apps) + cd $(project); $(PYTHON) manage.py test --exclude-tag gis $(apps) soft_test_gitlab: build_gitlab cd $(project); $(PYTHON) manage.py -k test $(apps) diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index afcdc713e..61caca858 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -19,7 +19,6 @@ from copy import deepcopy import csv -import datetime import json import os import shutil @@ -31,7 +30,6 @@ from rest_framework.authtoken.models import Token from django.conf import settings from django.contrib.auth.models import User, Permission, ContentType from django.contrib.gis.geos import GEOSGeometry -from django.core.exceptions import ObjectDoesNotExist from django.core.files import File from django.core.files.uploadedfile import SimpleUploadedFile from django.core.urlresolvers import reverse @@ -2074,6 +2072,7 @@ class TreatmentTest(FindInit, TestCase): self.assertEqual(initial_find.upstream_treatment, None) +@tag("gis") class GeomaticTest(FindInit, TestCase): fixtures = FIND_FIXTURES model = models.Find @@ -2251,7 +2250,7 @@ class GeomaticTest(FindInit, TestCase): bfp.transform(4326) tp = GEOSGeometry(cr.town.center.ewkt) tp.transform(4326) - self.assertTrue(bfp.distance(tp) < 0.0001) + self.assertLess(bfp.distance(tp), 0.0001) self.assertEqual(base_find.multi_polygon, cr.town.limit) self.assertEqual(base_find.point_source, 'T') # town self.assertEqual(base_find.point_source_item, |