Merge remote-tracking branch 'ibis-project/master'

ibis-project · May 16, 2018 · 71110e6 · 71110e6
2 parents 82b9d6b + d3c44dc
commit 71110e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/ibis/bigquery/tests/conftest.py b/ibis/bigquery/tests/conftest.py
@@ -19,6 +19,16 @@ def client():
         pytest.skip("no credentials found, skipping")
 
 
+@pytest.fixture(scope='session')
+def client2():
+    ga = pytest.importorskip('google.auth')
+
+    try:
+        return ibis.bigquery.connect(PROJECT_ID, DATASET_ID)
+    except ga.exceptions.DefaultCredentialsError:
+        pytest.skip("no credentials found, skipping")
+
+
 @pytest.fixture(scope='session')
 def alltypes(client):
     return client.table('functional_alltypes')

diff --git a/ibis/bigquery/tests/test_client.py b/ibis/bigquery/tests/test_client.py
@@ -423,10 +423,9 @@ def test_cross_project_query():
     assert df.tags.dtype == np.object
 
 
-def test_set_database():
-    con = ibis.bigquery.connect(project_id='ibis-gbq', dataset_id='testing')
-    con.set_database('bigquery-public-data.epa_historical_air_quality')
-    tables = con.list_tables()
+def test_set_database(client2):
+    client2.set_database('bigquery-public-data.epa_historical_air_quality')
+    tables = client2.list_tables()
     assert 'co_daily_summary' in tables