Skip to content

Refactor test_otel.py to use SQLA2 #59429

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

Closed
choo121600 wants to merge 1 commit into from
Closed

Refactor test_otel.py to use SQLA2 #59429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ repos:
^airflow-ctl.*\.py$|
^airflow-core/src/airflow/models/.*\.py$|
^airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_assets.py$|
^airflow-core/tests/integration/otel/test_otel.py$|
^task_sdk.*\.py$
pass_filenames: true
- id: update-supported-versions
Expand Down
27 changes: 13 additions & 14 deletions airflow-core/tests/integration/otel/test_otel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import time

import pytest
from sqlalchemy import select
from sqlalchemy import func, select

from airflow._shared.timezones import timezone
from airflow.dag_processing.bundles.manager import DagBundlesManager
Expand Down Expand Up @@ -87,13 +87,11 @@ def wait_for_dag_run_and_check_span_status(

while timezone.utcnow().timestamp() - start_time < max_wait_time:
with create_session() as session:
dag_run = (
session.query(DagRun)
.filter(
dag_run = session.scalar(
select(DagRun).where(
DagRun.dag_id == dag_id,
DagRun.run_id == run_id,
)
.first()
)

if dag_run is None:
Expand Down Expand Up @@ -121,13 +119,11 @@ def wait_for_dag_run_and_check_span_status(

def check_dag_run_state_and_span_status(dag_id: str, run_id: str, state: str, span_status: str):
with create_session() as session:
dag_run = (
session.query(DagRun)
.filter(
dag_run = session.scalar(
select(DagRun).where(
DagRun.dag_id == dag_id,
DagRun.run_id == run_id,
)
.first()
)

assert dag_run is not None
Expand All @@ -139,13 +135,11 @@ def check_dag_run_state_and_span_status(dag_id: str, run_id: str, state: str, sp

def check_ti_state_and_span_status(task_id: str, run_id: str, state: str, span_status: str | None):
with create_session() as session:
ti = (
session.query(TaskInstance)
.filter(
ti = session.scalar(
select(TaskInstance).where(
TaskInstance.task_id == task_id,
TaskInstance.run_id == run_id,
)
.first()
)

assert ti is not None
Expand Down Expand Up @@ -668,7 +662,12 @@ def serialize_and_get_dags(cls) -> dict[str, SerializedDAG]:
if AIRFLOW_V_3_0_PLUS:
from airflow.models.dagbundle import DagBundleModel

if session.query(DagBundleModel).filter(DagBundleModel.name == "testing").count() == 0:
count = session.scalar(
select(func.count())
.select_from(DagBundleModel)
.where(DagBundleModel.name == "testing")
)
if count == 0:
session.add(DagBundleModel(name="testing"))
session.commit()
SerializedDAG.bulk_write_to_db(
Expand Down