From 7130d695cc933899a4a8b4d236afcee7623705cf Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 2 Jan 2019 16:46:11 +0000 Subject: [PATCH 1/2] gbq --- pandas/tests/io/test_gbq.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pandas/tests/io/test_gbq.py b/pandas/tests/io/test_gbq.py index 15f366e5e2e9e..8dec901268828 100644 --- a/pandas/tests/io/test_gbq.py +++ b/pandas/tests/io/test_gbq.py @@ -12,12 +12,6 @@ from pandas import DataFrame, compat import pandas.util.testing as tm -try: - from unittest import mock -except ImportError: - mock = pytest.importorskip("mock") - - api_exceptions = pytest.importorskip("google.api_core.exceptions") bigquery = pytest.importorskip("google.cloud.bigquery") service_account = pytest.importorskip("google.oauth2.service_account") @@ -104,9 +98,7 @@ def make_mixed_dataframe_v2(test_size): def test_read_gbq_without_dialect_warns_future_change(monkeypatch): # Default dialect is changing to standard SQL. See: # https://github.com/pydata/pandas-gbq/issues/195 - mock_read_gbq = mock.Mock() - mock_read_gbq.return_value = DataFrame([[1.0]]) - monkeypatch.setattr(pandas_gbq, 'read_gbq', mock_read_gbq) + monkeypatch.setattr(pandas_gbq, 'read_gbq', lambda x: DataFrame([[1.0]])) with tm.assert_produces_warning(FutureWarning): pd.read_gbq("SELECT 1") From ab496f86f050e9aa7159f03041e5f631ee9f9e73 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 2 Jan 2019 18:16:42 +0000 Subject: [PATCH 2/2] no assumption on function arguments --- pandas/tests/io/test_gbq.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandas/tests/io/test_gbq.py b/pandas/tests/io/test_gbq.py index 8dec901268828..d3569af8d7786 100644 --- a/pandas/tests/io/test_gbq.py +++ b/pandas/tests/io/test_gbq.py @@ -98,7 +98,11 @@ def make_mixed_dataframe_v2(test_size): def test_read_gbq_without_dialect_warns_future_change(monkeypatch): # Default dialect is changing to standard SQL. See: # https://github.com/pydata/pandas-gbq/issues/195 - monkeypatch.setattr(pandas_gbq, 'read_gbq', lambda x: DataFrame([[1.0]])) + + def mock_read_gbq(*args, **kwargs): + return DataFrame([[1.0]]) + + monkeypatch.setattr(pandas_gbq, 'read_gbq', mock_read_gbq) with tm.assert_produces_warning(FutureWarning): pd.read_gbq("SELECT 1")