Fixed #25183 -- Fixed non-deterministic GeoIP test.

google.com doesn't always resolve to an IP inside the United States.

1 files changed, 4 insertions, 7 deletions

diff --git a/tests/gis_tests/test_geoip.py b/tests/gis_tests/test_geoip.py
index 7fe71fe84f..c77c7cc529 100644
--- a/tests/gis_tests/test_geoip.py
+++ b/tests/gis_tests/test_geoip.py
@@ -23,6 +23,8 @@ if HAS_GEOIP:
 @skipUnless(HAS_GEOIP and getattr(settings, "GEOIP_PATH", None),
     "GeoIP is required along with the GEOIP_PATH setting.")
 class GeoIPTest(unittest.TestCase):
+    addr = '128.249.1.1'
+    fqdn = 'tmc.edu'
 
     def test01_init(self):
         "Testing GeoIP initialization."
@@ -68,10 +70,7 @@ class GeoIPTest(unittest.TestCase):
         "Testing GeoIP country querying methods."
         g = GeoIP(city='<foo>')
 
-        fqdn = 'www.google.com'
-        addr = '12.215.42.19'
-
-        for query in (fqdn, addr):
+        for query in (self.fqdn, self.addr):
             for func in (g.country_code, g.country_code_by_addr, g.country_code_by_name):
                 self.assertEqual('US', func(query), 'Failed for func %s and query %s' % (func, query))
             for func in (g.country_name, g.country_name_by_addr, g.country_name_by_name):
@@ -84,9 +83,7 @@ class GeoIPTest(unittest.TestCase):
         "Testing GeoIP city querying methods."
         g = GeoIP(country='<foo>')
 
-        addr = '128.249.1.1'
-        fqdn = 'tmc.edu'
-        for query in (fqdn, addr):
+        for query in (self.fqdn, self.addr):
             # Country queries should still work.
             for func in (g.country_code, g.country_code_by_addr, g.country_code_by_name):
                 self.assertEqual('US', func(query))