summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2015-06-25 21:47:54 +0200
committerTim Graham <timograham@gmail.com>2015-07-30 18:16:45 -0400
commit22e9c87bb8f9094a42600fbbcad1b4aa608eb887 (patch)
tree67136f26e10a3ce1a5594df89c5229b31ca036e8
parent77566dcc6e489de9f711498b3d5c9018b50be176 (diff)
[1.8.x] Updated GeoIP test for newer versions
Backport of 3f9dca62cb31a2b4b279b7d312a850660d21e91f from master
-rw-r--r--tests/gis_tests/test_geoip.py9
1 files 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'))