innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

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

Backport of 5b6ca15073 from master
This commit is contained in:
Tim Graham 2015-07-30 12:16:14 -04:00
parent a9a1da4de6
commit 77566dcc6e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/gis_tests/test_geoip.py
View File

@ -26,6 +26,8 @@ if HAS_GEOS:
@skipUnless(HAS_GEOIP and getattr(settings, "GEOIP_PATH", None), @skipUnless(HAS_GEOIP and getattr(settings, "GEOIP_PATH", None),
"GeoIP is required along with the GEOIP_PATH setting.") "GeoIP is required along with the GEOIP_PATH setting.")
class GeoIPTest(unittest.TestCase): class GeoIPTest(unittest.TestCase):
addr = '128.249.1.1'
fqdn = 'tmc.edu'
def test01_init(self): def test01_init(self):
"Testing GeoIP initialization." "Testing GeoIP initialization."
@ -71,10 +73,7 @@ class GeoIPTest(unittest.TestCase):
"Testing GeoIP country querying methods." "Testing GeoIP country querying methods."
g = GeoIP(city='<foo>') g = GeoIP(city='<foo>')
fqdn = 'www.google.com' for query in (self.fqdn, self.addr):
addr = '12.215.42.19'
for query in (fqdn, addr):
for func in (g.country_code, g.country_code_by_addr, g.country_code_by_name): for func in (g.country_code, g.country_code_by_addr, g.country_code_by_name):
self.assertEqual('US', func(query)) self.assertEqual('US', func(query))
for func in (g.country_name, g.country_name_by_addr, g.country_name_by_name): for func in (g.country_name, g.country_name_by_addr, g.country_name_by_name):
@ -87,9 +86,7 @@ class GeoIPTest(unittest.TestCase):
"Testing GeoIP city querying methods." "Testing GeoIP city querying methods."
g = GeoIP(country='<foo>') g = GeoIP(country='<foo>')
addr = '128.249.1.1' for query in (self.fqdn, self.addr):
fqdn = 'tmc.edu'
for query in (fqdn, addr):
# Country queries should still work. # Country queries should still work.
for func in (g.country_code, g.country_code_by_addr, g.country_code_by_name): for func in (g.country_code, g.country_code_by_addr, g.country_code_by_name):
self.assertEqual('US', func(query)) self.assertEqual('US', func(query))