Commit 4fc5b487 authored by Tim Graham's avatar Tim Graham
Browse files

[1.7.x] Fixed #25183 -- Fixed non-deterministic GeoIP test. 

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

Backport of 5b6ca150 from master
parent 0f4f75a3

django/contrib/gis/geoip/tests.py

+4 −7
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ if HAS_GEOS: 
@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."
@@ -72,10 +74,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))

            for func in (g.country_name, g.country_name_by_addr, g.country_name_by_name):
@@ -88,9 +87,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))