Merge pull request #89 from dhermes/fix-slow-tests

Re-enabling disabled slow tests.
This commit is contained in:
Craig Citro
2014-12-09 13:45:12 -08:00

View File

@@ -373,7 +373,7 @@ class GoogleCredentialsTests(unittest.TestCase):
extra_help + ': ' + str(error), extra_help + ': ' + str(error),
str(ex)) str(ex))
def _disabled_test_get_application_default_from_environment_variable_service_account( def test_get_application_default_from_environment_variable_service_account(
self): self):
os.environ['SERVER_SOFTWARE'] = '' os.environ['SERVER_SOFTWARE'] = ''
environment_variable_file = datafile( environment_variable_file = datafile(
@@ -382,13 +382,13 @@ class GoogleCredentialsTests(unittest.TestCase):
self.validate_service_account_credentials( self.validate_service_account_credentials(
GoogleCredentials.get_application_default()) GoogleCredentials.get_application_default())
def _disabled_test_env_name(self): def test_env_name(self):
from oauth2client import client from oauth2client import client
self.assertEqual(None, client.SETTINGS.env_name) self.assertEqual(None, client.SETTINGS.env_name)
self.test_get_application_default_from_environment_variable_service_account() self.test_get_application_default_from_environment_variable_service_account()
self.assertEqual(DEFAULT_ENV_NAME, client.SETTINGS.env_name) self.assertEqual(DEFAULT_ENV_NAME, client.SETTINGS.env_name)
def _disabled_test_get_application_default_from_environment_variable_authorized_user( def test_get_application_default_from_environment_variable_authorized_user(
self): self):
os.environ['SERVER_SOFTWARE'] = '' os.environ['SERVER_SOFTWARE'] = ''
environment_variable_file = datafile( environment_variable_file = datafile(
@@ -398,7 +398,7 @@ class GoogleCredentialsTests(unittest.TestCase):
self.validate_google_credentials( self.validate_google_credentials(
GoogleCredentials.get_application_default()) GoogleCredentials.get_application_default())
def _disabled_test_get_application_default_from_environment_variable_malformed_file( def test_get_application_default_from_environment_variable_malformed_file(
self): self):
os.environ['SERVER_SOFTWARE'] = '' os.environ['SERVER_SOFTWARE'] = ''
environment_variable_file = datafile( environment_variable_file = datafile(
@@ -415,7 +415,7 @@ class GoogleCredentialsTests(unittest.TestCase):
environment_variable_file + ' (pointed to by ' + environment_variable_file + ' (pointed to by ' +
GOOGLE_APPLICATION_CREDENTIALS + ' environment variable):')) GOOGLE_APPLICATION_CREDENTIALS + ' environment variable):'))
def _disabled_test_get_application_default_environment_not_set_up(self): def test_get_application_default_environment_not_set_up(self):
# It is normal for this test to fail if run inside # It is normal for this test to fail if run inside
# a Google Compute Engine VM or after 'gcloud auth login' command # a Google Compute Engine VM or after 'gcloud auth login' command
# has been executed on a non Windows machine. # has been executed on a non Windows machine.