diff options
Diffstat (limited to 'chimere/tests.py')
| -rw-r--r-- | chimere/tests.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chimere/tests.py b/chimere/tests.py index 71fa12b..90e6143 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -137,7 +137,7 @@ class ImporterTest: self.assertEqual( nb, awaited_nb, msg=u"{}: get test failed - got {} when {} was awaited - {}" - .format(unicode(self.__class__), nb, awaited_nb, res)) + .format(str(self.__class__), nb, awaited_nb, res)) self.assertEqual(nb_updated, 0) for cat in importer.categories.all(): if cat not in nb_by_cat: @@ -150,7 +150,7 @@ class ImporterTest: self.assertEqual( nb_by_cat[cat], nb, msg=u"{} - category association test failed: {}/{}".format( - unicode(cat), nb, nb_by_cat[cat])) + str(cat), nb, nb_by_cat[cat])) # update for importer, awaited_nb in self.marker_importers: importer.overwrite = True @@ -161,7 +161,7 @@ class ImporterTest: self.assertEqual( nb, 0, msg=u"{}: update test failed - new items have been add" - .format(unicode(self.__class__))) + .format(str(self.__class__))) # TODO: v3 - retablir overwrite """ # manage overwrite @@ -188,7 +188,7 @@ class ImporterTest: continue self.assertEqual( nb, 1, msg=u"%s: overwrite test failed" % - unicode(self.__class__))""" + str(self.__class__))""" class KMLImporterTest(TestCase, ImporterTest): @@ -410,14 +410,14 @@ class AdminTest(AdministratorsTest): self.client.post( '/admin/chimere/marker/', data={'action': ['disable'], - '_selected_action': [unicode(m.pk) for m in self.markers], + '_selected_action': [str(m.pk) for m in self.markers], }) self.assertEqual(q_markers.count(), q_markers.filter(status='D').count()) # validate self.client.post('/admin/chimere/marker/', data={'action': ['validate'], - '_selected_action': [unicode(m.pk) + '_selected_action': [str(m.pk) for m in self.markers] }) self.assertEqual(q_markers.count(), @@ -613,7 +613,7 @@ class RapprochementTest(TestCase): '/admin/chimere/marker/', data={'action': ['managed_modified'], 'index': 0, 'rapprochement': 1, 'name': 1, 'point': 1, - '_selected_action': [unicode(ref_marker.pk)]}) + '_selected_action': [str(ref_marker.pk)]}) ref_marker = Marker.objects.get(pk=ref_marker.pk) self.assertEqual(Marker.objects.filter(ref_item=ref_marker, status='M').count(), 0) @@ -634,7 +634,7 @@ class RapprochementTest(TestCase): data={'action': ['managed_modified'], 'index': 0, 'rapprochement': 1, 'name': 1, 'point': 1, - '_selected_action': [unicode(ref_marker.pk)] + '_selected_action': [str(ref_marker.pk)] }) ref_marker = Marker.objects.get(pk=ref_marker.pk) self.assertEqual(Marker.objects.filter(ref_item=ref_marker, @@ -654,7 +654,7 @@ class RapprochementTest(TestCase): data={'action': ['managed_modified'], 'index': 0, 'rapprochement': 1, 'name': 1, 'route': 1, 'categories': 1, - '_selected_action': [unicode(ref_route.pk)] + '_selected_action': [str(ref_route.pk)] }) ref_route = Route.objects.get(pk=ref_route.pk) self.assertEqual(Route.objects.filter(ref_item=ref_route, |