Skip to content

chore: make labels tests more robust to test order #2246

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
merged 2 commits into from
Nov 10, 2025
Merged

chore: make labels tests more robust to test order #2246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3e7b17
chore: make labels tests more robust to test order
tswast Nov 10, 2025
6588e9c
remove references to global _api_methods
tswast Nov 10, 2025
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
3 changes: 3 additions & 0 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ on:
pull_request:
branches:
- main
push:
Copy link
Collaborator Author

@tswast tswast Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will make it easier to look through https://github.com/googleapis/python-bigquery-dataframes/actions?query=branch%3Amain+event%3Apush to see when failures started.

branches:
- main
name: docs
jobs:
docs:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ on:
pull_request:
branches:
- main
push:
branches:
- main
name: lint
jobs:
lint:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/mypy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ on:
pull_request:
branches:
- main
push:
branches:
- main
name: mypy
jobs:
mypy:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/unittest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ on:
pull_request:
branches:
- main
push:
branches:
- main
name: unittest
jobs:
unit:
Expand Down
3 changes: 2 additions & 1 deletion owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@
".kokoro/build.sh",
".kokoro/continuous/common.cfg",
".kokoro/presubmit/common.cfg",
# Temporary workaround to update docs job to use python 3.10
".github/workflows/docs.yml",
".github/workflows/lint.yml",
".github/workflows/unittest.yml",
],
)

Expand Down
52 changes: 23 additions & 29 deletions tests/unit/session/test_io_bigquery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
from unittest import mock

import google.cloud.bigquery as bigquery
import google.cloud.bigquery.job
import google.cloud.bigquery.table
import pytest

import bigframes
from bigframes.core import log_adapter
import bigframes.core.events
import bigframes.pandas as bpd
import bigframes.session._io.bigquery
import bigframes.session._io.bigquery as io_bq
from bigframes.testing import mocks

Expand All @@ -32,7 +35,7 @@
def mock_bq_client():
mock_client = mock.create_autospec(bigquery.Client)
mock_query_job = mock.create_autospec(bigquery.QueryJob)
mock_row_iterator = mock.create_autospec(bigquery.table.RowIterator)
mock_row_iterator = mock.create_autospec(google.cloud.bigquery.table.RowIterator)

mock_query_job.result.return_value = mock_row_iterator

Expand Down Expand Up @@ -98,14 +101,12 @@ def test_create_job_configs_labels_log_adaptor_call_method_under_length_limit():
cur_labels = {
"source": "bigquery-dataframes-temp",
}
df = bpd.DataFrame(
{"col1": [1, 2], "col2": [3, 4]}, session=mocks.create_bigquery_session()
)
# Test running two methods
df.head()
df.max()
df.columns
api_methods = log_adapter._api_methods
api_methods = [
"dataframe-columns",
"dataframe-max",
"dataframe-head",
"dataframe-__init__",
]

labels = io_bq.create_job_configs_labels(
job_configs_labels=cur_labels, api_methods=api_methods
Expand All @@ -123,17 +124,13 @@ def test_create_job_configs_labels_log_adaptor_call_method_under_length_limit():

def test_create_job_configs_labels_length_limit_met_and_labels_is_none():
log_adapter.get_and_reset_api_methods()
df = bpd.DataFrame(
{"col1": [1, 2], "col2": [3, 4]}, session=mocks.create_bigquery_session()
)
# Test running methods more than the labels' length limit
for i in range(100):
df.head()
api_methods = log_adapter._api_methods
api_methods = list(["dataframe-head"] * 100)

labels = io_bq.create_job_configs_labels(
job_configs_labels=None, api_methods=api_methods
)
with bpd.option_context("compute.extra_query_labels", {}):
labels = io_bq.create_job_configs_labels(
job_configs_labels=None, api_methods=api_methods
)
assert labels is not None
assert len(labels) == log_adapter.MAX_LABELS_COUNT
assert "dataframe-head" in labels.values()
Expand All @@ -150,17 +147,14 @@ def test_create_job_configs_labels_length_limit_met():
value = f"test{i}"
cur_labels[key] = value
# If cur_labels length is 62, we can only add one label from api_methods
df = bpd.DataFrame(
{"col1": [1, 2], "col2": [3, 4]}, session=mocks.create_bigquery_session()
)
# Test running two methods
df.head()
df.max()
api_methods = log_adapter._api_methods
api_methods = ["dataframe-max", "dataframe-head"]

with bpd.option_context("compute.extra_query_labels", {}):
labels = io_bq.create_job_configs_labels(
job_configs_labels=cur_labels, api_methods=api_methods
)

labels = io_bq.create_job_configs_labels(
job_configs_labels=cur_labels, api_methods=api_methods
)
assert labels is not None
assert len(labels) == 56
assert "dataframe-max" in labels.values()
Expand All @@ -184,7 +178,7 @@ def test_add_and_trim_labels_length_limit_met():
{"col1": [1, 2], "col2": [3, 4]}, session=mocks.create_bigquery_session()
)

job_config = bigquery.job.QueryJobConfig()
job_config = google.cloud.bigquery.job.QueryJobConfig()
job_config.labels = cur_labels

df.max()
Expand Down Expand Up @@ -221,7 +215,7 @@ def test_start_query_with_client_labels_length_limit_met(
{"col1": [1, 2], "col2": [3, 4]}, session=mocks.create_bigquery_session()
)

job_config = bigquery.job.QueryJobConfig()
job_config = google.cloud.bigquery.job.QueryJobConfig()
job_config.labels = cur_labels

df.max()
Expand Down