p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.10.x] Fixed nonexistent tmc.edu domain in GeoIP test. 

The test was silently skipped.

Backport of e1f6eba033 from master
This commit is contained in:
Tim Graham 2016-10-11 19:31:13 -04:00
parent 43792137e0
commit fba2c16a6f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/gis_tests/test_geoip.py
View File

@ -32,8 +32,8 @@ if HAS_GEOIP:
) )
@ignore_warnings(category=RemovedInDjango20Warning) @ignore_warnings(category=RemovedInDjango20Warning)
class GeoIPTest(unittest.TestCase): class GeoIPTest(unittest.TestCase):
addr = '128.249.1.1' addr = '162.242.220.127'
fqdn = 'tmc.edu' fqdn = 'www.djangoproject.com'
def _is_dns_available(self, domain): def _is_dns_available(self, domain):
# Naive check to see if there is DNS available to use. # Naive check to see if there is DNS available to use.
@ -127,12 +127,12 @@ class GeoIPTest(unittest.TestCase):
# City information dictionary. # City information dictionary.
d = g.city(query) d = g.city(query)
self.assertEqual('USA', d['country_code3']) self.assertEqual('USA', d['country_code3'])
self.assertEqual('Houston', d['city']) self.assertEqual('San Antonio', d['city'])
self.assertEqual('TX', d['region']) self.assertEqual('TX', d['region'])
self.assertEqual(713, d['area_code']) self.assertEqual(210, d['area_code'])
geom = g.geos(query) geom = g.geos(query)
self.assertIsInstance(geom, GEOSGeometry) self.assertIsInstance(geom, GEOSGeometry)
lon, lat = (-95.4010, 29.7079) lon, lat = (-98, 29)
lat_lon = g.lat_lon(query) lat_lon = g.lat_lon(query)
lat_lon = (lat_lon[1], lat_lon[0]) lat_lon = (lat_lon[1], lat_lon[0])
for tup in (geom.tuple, g.coords(query), g.lon_lat(query), lat_lon): for tup in (geom.tuple, g.coords(query), g.lon_lat(query), lat_lon):