Fiddle with GCE timeouts (again).

googleapis · Jan 7, 2015 · bf9d46e · bf9d46e
1 parent 3b3d897
commit bf9d46e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/oauth2client/client.py b/oauth2client/client.py
@@ -938,7 +938,7 @@ def _detect_gce_environment(urlopen=None):
   # the metadata resolution was particularly slow. The latter case is
   # "unlikely".
   try:
-    response = urlopen('http://metadata.google.internal/', timeout=1)
+    response = urlopen('http://169.254.169.254/', timeout=0.1)
     return any('Metadata-Flavor: Google' in header
                for header in response.info().headers)
   except socket.timeout:

diff --git a/tests/test_oauth2client.py b/tests/test_oauth2client.py
@@ -212,7 +212,7 @@ def test_get_environment_gce_production(self):
                            autospec=True) as urlopen:
       self.assertEqual('GCE_PRODUCTION', _get_environment())
       urlopen.assert_called_once_with(
-          'http://metadata.google.internal/', timeout=1)
+          'http://169.254.169.254/', timeout=0.1)
 
   def test_get_environment_unknown(self):
     os.environ['SERVER_SOFTWARE'] = ''
@@ -221,7 +221,7 @@ def test_get_environment_unknown(self):
                            autospec=True) as urlopen:
       self.assertEqual(DEFAULT_ENV_NAME, _get_environment())
       urlopen.assert_called_once_with(
-          'http://metadata.google.internal/', timeout=1)
+          'http://169.254.169.254/', timeout=0.1)
 
   def test_get_environment_variable_file(self):
     environment_variable_file = datafile(