Skip to content

test: fix pandas tests with new bqstorage client #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tswast merged 4 commits into from
Jan 19, 2022
Merged

test: fix pandas tests with new bqstorage client #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
beac4a0
wip: attempt to fix pandas tests with new bqstorage client
tswast Jan 14, 2022
56aaa94
mock a bit more
tswast Jan 18, 2022
05e5cc1
update other test too
tswast Jan 18, 2022
d4e1392
make flakey test more robust
tswast Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/system/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,7 +1552,7 @@ def test_dbapi_connection_does_not_leak_sockets(self):

connection.close()
conn_count_end = len(current_process.connections())
self.assertEqual(conn_count_end, conn_count_start)
self.assertLessEqual(conn_count_end, conn_count_start)

def _load_table_for_dml(self, rows, dataset_id, table_id):
from google.cloud._testing import _NamedTemporaryFile
Expand Down
50 changes: 28 additions & 22 deletions tests/unit/job/test_query_pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
except (ImportError, AttributeError): # pragma: NO COVER
tqdm = None

from google.cloud.bigquery._helpers import BQ_STORAGE_VERSIONS
from ..helpers import make_connection
from .helpers import _make_client
from .helpers import _make_job_resource
Expand Down Expand Up @@ -142,18 +141,22 @@ def test_to_dataframe_bqstorage_preserve_order(query, table_read_options_kwarg):
session = bigquery_storage.types.ReadSession()
session.arrow_schema.serialized_schema = arrow_schema.serialize().to_pybytes()
session.streams = [bigquery_storage.types.ReadStream(name=stream_id)]
bqstorage_client.create_read_session.return_value = session
bqstorage_base_client = mock.create_autospec(bigquery_storage.BigQueryReadClient)
page = bigquery_storage.types.ReadRowsResponse()
if BQ_STORAGE_VERSIONS.is_read_session_optional:
page.arrow_schema.serialized_schema = arrow_schema.serialize().to_pybytes()
page.arrow_record_batch.serialized_record_batch = (
record_batch.serialize().to_pybytes()
reader = mock.create_autospec(
google.cloud.bigquery_storage_v1.reader.ReadRowsStream, instance=True
)
row_iterable = mock.create_autospec(
google.cloud.bigquery_storage_v1.reader.ReadRowsIterable, instance=True
)
page = mock.create_autospec(
google.cloud.bigquery_storage_v1.reader.ReadRowsPage, instance=True
)
bqstorage_base_client.read_rows.return_value = [page]
reader = google.cloud.bigquery_storage_v1.reader.ReadRowsStream(
[page], bqstorage_base_client, stream_id, 0, {}
page.to_arrow.return_value = record_batch
type(row_iterable).pages = mock.PropertyMock(return_value=[page])
reader.rows.return_value = row_iterable
bqstorage_client = mock.create_autospec(
bigquery_storage.BigQueryReadClient, instance=True
)
bqstorage_client.create_read_session.return_value = session
bqstorage_client.read_rows.return_value = reader

dataframe = job.to_dataframe(bqstorage_client=bqstorage_client)
Expand Down Expand Up @@ -536,22 +539,25 @@ def test_to_dataframe_bqstorage(table_read_options_kwarg):
connection = make_connection(query_resource)
client = _make_client(connection=connection)
job = target_class.from_api_repr(resource, client)
bqstorage_client = mock.create_autospec(bigquery_storage.BigQueryReadClient)
session = bigquery_storage.types.ReadSession()
session.arrow_schema.serialized_schema = arrow_schema.serialize().to_pybytes()
session.streams = [bigquery_storage.types.ReadStream(name=stream_id)]
bqstorage_client.create_read_session.return_value = session
bqstorage_base_client = mock.create_autospec(bigquery_storage.BigQueryReadClient)
page = bigquery_storage.types.ReadRowsResponse()
if BQ_STORAGE_VERSIONS.is_read_session_optional:
page.arrow_schema.serialized_schema = arrow_schema.serialize().to_pybytes()
page.arrow_record_batch.serialized_record_batch = (
record_batch.serialize().to_pybytes()
reader = mock.create_autospec(
google.cloud.bigquery_storage_v1.reader.ReadRowsStream, instance=True
)
row_iterable = mock.create_autospec(
google.cloud.bigquery_storage_v1.reader.ReadRowsIterable, instance=True
)
bqstorage_base_client.read_rows.return_value = [page]
reader = google.cloud.bigquery_storage_v1.reader.ReadRowsStream(
[page], bqstorage_base_client, stream_id, 0, {}
page = mock.create_autospec(
google.cloud.bigquery_storage_v1.reader.ReadRowsPage, instance=True
)
page.to_arrow.return_value = record_batch
type(row_iterable).pages = mock.PropertyMock(return_value=[page])
reader.rows.return_value = row_iterable
bqstorage_client = mock.create_autospec(
bigquery_storage.BigQueryReadClient, instance=True
)
bqstorage_client.create_read_session.return_value = session
bqstorage_client.read_rows.return_value = reader

dataframe = job.to_dataframe(bqstorage_client=bqstorage_client)
Expand Down