[1.7.x] Updated GeoIP test for newer versions

Backport of 3f9dca6 from master
django · Jul 30, 2015 · 9efddb7 · 9efddb7
1 parent 4fc5b48
commit 9efddb7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/django/contrib/gis/geoip/tests.py b/django/contrib/gis/geoip/tests.py
@@ -114,7 +114,8 @@ def test04_city(self):
     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'))