concav unable to capture coverage

Author: mhaseebtariq

pandas/io/gbq.py

@@ -160,12 +160,14 @@ def get_credentials(self):
             return self.get_service_account_credentials()
         else:
             # Try to retrieve Application Default Credentials
-            credentials = self.get_application_default_credentials()
+            project_id = self.project_id
+            credentials = self.get_application_default_credentials(project_id)
             if not credentials:
                 credentials = self.get_user_account_credentials()
             return credentials
 
-    def get_application_default_credentials(self):
+    @staticmethod
+    def get_application_default_credentials(project_id):
         from oauth2client.client import GoogleCredentials
         from oauth2client.client import AccessTokenRefreshError
         from oauth2client.client import ApplicationDefaultCredentialsError
@@ -182,8 +184,8 @@ def get_application_default_credentials(self):
         jobs = bigquery_service.jobs()
         job_data = {'configuration': {'query': {'query': 'SELECT 1'}}}
         try:
-            jobs.insert(projectId=self.project_id, body=job_data).execute()
-        except (AccessTokenRefreshError, HttpError):
+            jobs.insert(projectId=project_id, body=job_data).execute()
+        except (AccessTokenRefreshError, HttpError, TypeError):
             return None
         return credentials
 

pandas/io/tests/test_gbq.py

@@ -189,6 +189,20 @@ def test_generate_bq_schema_deprecated():
         df = make_mixed_dataframe_v2(10)
         gbq.generate_bq_schema(df)
 
+def google_credentials_import():
+    try:
+        from oauth2client.client import GoogleCredentials
+        return GoogleCredentials
+    except ImportError:
+        return type(None)
+
+def test_should_be_able_to_get_credentials_from_default_credentials():
+    GoogleCredentials = google_credentials_import()
+    connector = gbq.GbqConnector
+    credentials = connector.get_application_default_credentials(PROJECT_ID)
+    valid_types = (type(None), GoogleCredentials)
+    assert isinstance(credentials, valid_types)
+
 
 class TestGBQConnectorIntegration(tm.TestCase):
 
@@ -219,12 +233,6 @@ def test_should_be_able_to_get_results_from_query(self):
         schema, pages = self.sut.run_query('SELECT 1')
         self.assertTrue(pages is not None)
 
-    def test_should_be_able_to_get_credentials_from_default_credentials(self):
-        from oauth2client.client import GoogleCredentials
-        credentials = self.sut.get_application_default_credentials()
-        valid_types = (type(None), GoogleCredentials)
-        self.assertTrue(isinstance(credentials, valid_types))
-
 
 class TestGBQConnectorServiceAccountKeyPathIntegration(tm.TestCase):
     def setUp(self):