From 22e9c87bb8f9094a42600fbbcad1b4aa608eb887 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 25 Jun 2015 21:47:54 +0200 Subject: [PATCH] [1.8.x] Updated GeoIP test for newer versions Backport of 3f9dca62cb31a2b4b279b7d312a850660d21e91f from master --- tests/gis_tests/test_geoip.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/gis_tests/test_geoip.py b/tests/gis_tests/test_geoip.py index 908b497962..2fb6c2ce94 100644 --- a/tests/gis_tests/test_geoip.py +++ b/tests/gis_tests/test_geoip.py @@ -113,7 +113,8 @@ class GeoIPTest(unittest.TestCase): def test05_unicode_response(self): "Testing that GeoIP strings are properly encoded, see #16553." g = GeoIP() - d = g.city("www.osnabrueck.de") - self.assertEqual('Osnabrück', d['city']) - d = g.country('200.7.49.81') - self.assertEqual('Curaçao', d['country_name']) + d = g.city("duesseldorf.de") + self.assertEqual('Düsseldorf', d['city']) + d = g.country('200.26.205.1') + # Some databases have only unaccented countries + self.assertIn(d['country_name'], ('Curaçao', 'Curacao'))