summaryrefslogtreecommitdiff
path: root/chimere/tests.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-22 21:10:16 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-22 21:10:16 +0200
commit47458b74046cd083ae48f21fb133b59d1ee5e7f9 (patch)
tree945edecb3fd147eae296d609c9271bee0ff1fd5a /chimere/tests.py
parentdefbf97107827e694cf72a23ed9b9d0533b7c0e7 (diff)
downloadChimère-47458b74046cd083ae48f21fb133b59d1ee5e7f9.tar.bz2
Chimère-47458b74046cd083ae48f21fb133b59d1ee5e7f9.zip
Tests: fix V3tov2 test
Diffstat (limited to 'chimere/tests.py')
-rw-r--r--chimere/tests.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/chimere/tests.py b/chimere/tests.py
index e8b280f..641a9cd 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -754,11 +754,13 @@ class V3ToV2Test(TestCase):
sys.stdout = StringIO()
call_command('v3_to_v2_markers')
vals = sys.stdout.getvalue()
- markers = json.loads(vals)
- self.assertEqual(len(markers), 4)
+ values = json.loads(vals)
+ markers = [k for k in values
+ if k['model'] == 'chimere.marker']
+ self.assertEqual(len(markers), len(self.markers))
self.assertNotIn('weight', markers[0]['fields'])
self.assertNotIn('normalised_weight', markers[0]['fields'])
- self.assertEqual(markers[-1]['fields']['value'], 'myproperty')
+ self.assertEqual(values[-1]['fields']['value'], 'myproperty')
self.assertNotIn('polygon', markers[-1]['fields'])
self.assertNotIn('route', markers[-1]['fields'])
sys.stdout = sysout
@@ -768,7 +770,7 @@ class V3ToV2Test(TestCase):
sys.stdout = StringIO()
call_command('v3_to_v2_routes')
vals = sys.stdout.getvalue()
- routes = json.loads(vals)
+ routes = [k for k in json.loads(vals) if k['model'] == 'chimere.route']
self.assertEqual(len(routes), len(self.routes))
self.assertNotIn('weight', routes[0]['fields'])
self.assertNotIn('normalised_weight', routes[0]['fields'])