This is an automated email from the ASF dual-hosted git repository.
amoghdesai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 4688c68f126 Rename task sdk integration tests folder hierarchy
correctly (#58193)
4688c68f126 is described below
commit 4688c68f12688a134320c916902f4e373843c977
Author: Amogh Desai <[email protected]>
AuthorDate: Wed Nov 12 00:27:46 2025 +0530
Rename task sdk integration tests folder hierarchy correctly (#58193)
---
.dockerignore | 2 +-
.github/CODEOWNERS | 2 +-
Dockerfile | 2 +-
Dockerfile.ci | 2 +-
.../testing/task_sdk_integration_tests.rst | 22 +++++++++++-----------
dev/breeze/doc/05_test_commands.rst | 2 +-
dev/breeze/src/airflow_breeze/utils/run_tests.py | 2 +-
pyproject.toml | 10 +++++-----
.../docker/install_airflow_when_building_images.sh | 2 +-
setup_idea.py | 2 +-
.../dags/test_asset_dag.py | 0
.../dags/test_dag.py | 0
.../docker/docker-compose.yaml | 0
.../pyproject.toml | 4 ++--
.../tests/task_sdk_tests/__init__.py | 0
.../tests/task_sdk_tests/conftest.py | 0
.../tests/task_sdk_tests/constants.py | 0
.../tests/task_sdk_tests/jwt_plugin.py | 0
.../task_sdk_tests/test_asset_event_operations.py | 0
.../tests/task_sdk_tests/test_asset_operations.py | 0
.../task_sdk_tests/test_connection_operations.py | 0
.../task_sdk_tests/test_dag_run_operations.py | 0
.../test_task_instance_operations.py | 0
.../tests/task_sdk_tests/test_task_sdk_health.py | 0
.../task_sdk_tests/test_variable_operations.py | 0
.../tests/task_sdk_tests/test_xcom_operations.py | 0
26 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index e3bf4af4f26..6e05631ec74 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -46,7 +46,7 @@
!docker-tests
!helm-tests
!kubernetes-tests
-!task-sdk-tests
+!task-sdk-integration-tests
!airflow-ctl-tests
!shared/
!airflow-e2e-tests
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bd3cdd7005d..1c3c906904a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -108,7 +108,7 @@ Dockerfile.ci @potiuk @ashb @gopidesupavan @amoghrajesh
@jscheffl @bugraoz93 @ka
/airflow-e2e-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl
@bugraoz93 @kaxil @jason810496
# Task SDK integration tests
-/task-sdk-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl
@bugraoz93 @kaxil @jason810496
+/task-sdk-integration-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh
@jscheffl @bugraoz93 @kaxil @jason810496
# airflowctl integration tests
/airflow-ctl-tests/ @potiuk @ashb @gopidesupavan @amoghrajesh @jscheffl
@bugraoz93 @kaxil @jason810496
diff --git a/Dockerfile b/Dockerfile
index 3f42e1cdaa3..9cd8e421113 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1090,7 +1090,7 @@ function install_from_sources() {
installation_command_flags=" --editable .[${AIRFLOW_EXTRAS}] \
--editable ./airflow-core --editable ./task-sdk --editable
./airflow-ctl \
--editable ./kubernetes-tests --editable ./docker-tests
--editable ./helm-tests \
- --editable ./task-sdk-tests \
+ --editable ./task-sdk-integration-tests \
--editable ./airflow-ctl-tests \
--editable ./airflow-e2e-tests \
--editable ./devel-common[all] --editable ./dev \
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 2a48a21c119..1f638269cc0 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -844,7 +844,7 @@ function install_from_sources() {
installation_command_flags=" --editable .[${AIRFLOW_EXTRAS}] \
--editable ./airflow-core --editable ./task-sdk --editable
./airflow-ctl \
--editable ./kubernetes-tests --editable ./docker-tests
--editable ./helm-tests \
- --editable ./task-sdk-tests \
+ --editable ./task-sdk-integration-tests \
--editable ./airflow-ctl-tests \
--editable ./airflow-e2e-tests \
--editable ./devel-common[all] --editable ./dev \
diff --git a/contributing-docs/testing/task_sdk_integration_tests.rst
b/contributing-docs/testing/task_sdk_integration_tests.rst
index f7efb2e6f40..d1e4b7082b0 100644
--- a/contributing-docs/testing/task_sdk_integration_tests.rst
+++ b/contributing-docs/testing/task_sdk_integration_tests.rst
@@ -97,16 +97,16 @@ directly:
.. code-block:: bash
- # Navigate to task-sdk-tests directory and run tests
- cd task-sdk-tests/
+ # Navigate to task-sdk-integration-tests directory and run tests
+ cd task-sdk-integration-tests/
uv run pytest -s
# Run specific test file
- cd task-sdk-tests/
+ cd task-sdk-integration-tests/
uv run pytest tests/task_sdk_tests/test_task_sdk_health.py -s
# Keep containers running for debugging
- cd task-sdk-tests/
+ cd task-sdk-integration-tests/
SKIP_DOCKER_COMPOSE_DELETION=1 uv run pytest -s
**Optional: Set Custom Docker Image**
@@ -114,7 +114,7 @@ directly:
.. code-block:: bash
# Use a different Airflow image for testing
- cd task-sdk-tests/
+ cd task-sdk-integration-tests/
DOCKER_IMAGE=my-custom-airflow:latest uv run pytest -s
@@ -127,18 +127,18 @@ and the Docker Compose deployment is shut down. To debug
issues more effectively
.. code-block:: bash
# Run with maximum verbosity
- cd task-sdk-tests/
+ cd task-sdk-integration-tests/
uv run pytest tests/task_sdk_tests/ -vvv -s --tb=long
# Keep containers running for inspection (local environment)
- cd task-sdk-tests/
+ cd task-sdk-integration-tests/
SKIP_DOCKER_COMPOSE_DELETION=1 uv run pytest
tests/task_sdk_tests/test_task_sdk_health.py::test_task_sdk_health
# Keep containers running for inspection (using Breeze)
breeze testing task-sdk-integration-tests --skip-docker-compose-deletion
# Inspect container logs (when containers are still running)
- cd task-sdk-tests/docker
+ cd task-sdk-integration-tests/docker
docker-compose logs airflow-apiserver
docker-compose logs airflow-scheduler
docker-compose logs postgres
@@ -153,7 +153,7 @@ and the Docker Compose deployment is shut down. To debug
issues more effectively
- **Local environment**: Export ``SKIP_DOCKER_COMPOSE_DELETION=1`` before
running tests
- **Breeze environment**: Use the ``--skip-docker-compose-deletion`` flag
- Remember to manually clean up containers when done: ``cd
task-sdk-tests/docker && docker-compose down -v``
+ Remember to manually clean up containers when done: ``cd
task-sdk-integration-tests/docker && docker-compose down -v``
Testing Custom Airflow Images
..............................
@@ -168,7 +168,7 @@ To test the Task SDK against custom Airflow builds:
# Use custom image for integration tests
export DOCKER_IMAGE=my-custom-airflow:latest
- cd task-sdk-tests
+ cd task-sdk-integration-tests
uv run pytest tests/task_sdk_tests/
Common Issues and Solutions
@@ -192,7 +192,7 @@ The Task SDK Integration Tests are organized as follows:
.. code-block::
- task-sdk-tests/
+ task-sdk-integration-tests/
├── pyproject.toml # Test package configuration and
dependencies
├── docker/
│ └── docker-compose.yaml # Airflow services configuration
diff --git a/dev/breeze/doc/05_test_commands.rst
b/dev/breeze/doc/05_test_commands.rst
index 3436e4eced5..ce937fc7f49 100644
--- a/dev/breeze/doc/05_test_commands.rst
+++ b/dev/breeze/doc/05_test_commands.rst
@@ -353,7 +353,7 @@ a local venv. You can build the prod image with breeze and
that will be used by
You can override the ``DOCKER_IMAGE`` environment variable to point to the
image to test using the
``breeze testing task-sdk-integration-tests`` command.
-The task-sdk tests are in ``task-sdk-tests/`` folder in the main repo.
+The task-sdk integration tests are in ``task-sdk-integration-tests/`` folder
in the main repo.
Running Airflow E2E tests
.........................
diff --git a/dev/breeze/src/airflow_breeze/utils/run_tests.py
b/dev/breeze/src/airflow_breeze/utils/run_tests.py
index ab04cfd831c..e0a970cdfa9 100644
--- a/dev/breeze/src/airflow_breeze/utils/run_tests.py
+++ b/dev/breeze/src/airflow_breeze/utils/run_tests.py
@@ -43,7 +43,7 @@ DOCKER_TESTS_ROOT_PATH = AIRFLOW_ROOT_PATH / "docker-tests"
DOCKER_TESTS_TESTS_MODULE_PATH = DOCKER_TESTS_ROOT_PATH / "tests" /
"docker_tests"
DOCKER_TESTS_REQUIREMENTS = DOCKER_TESTS_ROOT_PATH / "requirements.txt"
-TASK_SDK_TESTS_ROOT_PATH = AIRFLOW_ROOT_PATH / "task-sdk-tests"
+TASK_SDK_TESTS_ROOT_PATH = AIRFLOW_ROOT_PATH / "task-sdk-integration-tests"
TASK_SDK_TESTS_TESTS_MODULE_PATH = TASK_SDK_TESTS_ROOT_PATH / "tests" /
"task_sdk_tests"
TASK_SDK_TESTS_REQUIREMENTS = TASK_SDK_TESTS_ROOT_PATH / "requirements.txt"
diff --git a/pyproject.toml b/pyproject.toml
index ed959bb2bd7..674a8d12fce 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -778,7 +778,7 @@ testing = ["dev", "providers.tests", "tests_common",
"tests", "system", "unit",
"airflow-core/tests/*" = ["D", "TID253", "S101", "TRY002"]
"airflow-e2e-tests/tests/*" = ["D", "TID253", "S101", "TRY002"]
"docker-tests/*" = ["D", "TID253", "S101", "TRY002"]
-"task-sdk-tests/*" = ["D", "TID253", "S101", "TRY002"]
+"task-sdk-integration-tests/*" = ["D", "TID253", "S101", "TRY002"]
"kubernetes-tests/*" = ["D", "TID253", "S101", "TRY002"]
"helm-tests/*" = ["D", "TID253", "S101", "TRY002"]
"providers/**/tests/*" = ["D", "TID253", "S101", "TRY002"]
@@ -1041,7 +1041,7 @@ mypy_path = [
"$MYPY_CONFIG_FILE_DIR/helm-tests/tests",
"$MYPY_CONFIG_FILE_DIR/kubernetes-tests/tests",
"$MYPY_CONFIG_FILE_DIR/docker-tests/tests",
- "$MYPY_CONFIG_FILE_DIR/task-sdk-tests/tests",
+ "$MYPY_CONFIG_FILE_DIR/task-sdk-integration-tests/tests",
# Automatically generated mypy paths (update_airflow_pyproject_toml.py)
"$MYPY_CONFIG_FILE_DIR/providers/airbyte/src",
"$MYPY_CONFIG_FILE_DIR/providers/airbyte/tests",
@@ -1287,7 +1287,7 @@ dev = [
"apache-airflow-dev",
"apache-airflow-devel-common[no-doc]",
"apache-airflow-docker-tests",
- "apache-airflow-task-sdk-tests",
+ "apache-airflow-task-sdk-integration-tests",
"apache-airflow-helm-tests",
"apache-airflow-kubernetes-tests",
"apache-airflow-task-sdk[all]",
@@ -1339,7 +1339,7 @@ apache-airflow-task-sdk = { workspace = true }
apache-airflow-devel-common = { workspace = true }
apache-airflow-docker-tests = { workspace = true }
apache-airflow-e2e-tests = { workspace = true }
-apache-airflow-task-sdk-tests = { workspace = true }
+apache-airflow-task-sdk-integration-tests = { workspace = true }
apache-airflow-helm-tests = { workspace = true }
apache-airflow-kubernetes-tests = { workspace = true }
apache-airflow-providers = { workspace = true }
@@ -1458,7 +1458,7 @@ members = [
"dev",
"devel-common",
"docker-tests",
- "task-sdk-tests",
+ "task-sdk-integration-tests",
"helm-tests",
"kubernetes-tests",
"task-sdk",
diff --git a/scripts/docker/install_airflow_when_building_images.sh
b/scripts/docker/install_airflow_when_building_images.sh
index 7d91bb41c1b..05f1e3ad19b 100644
--- a/scripts/docker/install_airflow_when_building_images.sh
+++ b/scripts/docker/install_airflow_when_building_images.sh
@@ -80,7 +80,7 @@ function install_from_sources() {
installation_command_flags=" --editable .[${AIRFLOW_EXTRAS}] \
--editable ./airflow-core --editable ./task-sdk --editable
./airflow-ctl \
--editable ./kubernetes-tests --editable ./docker-tests
--editable ./helm-tests \
- --editable ./task-sdk-tests \
+ --editable ./task-sdk-integration-tests \
--editable ./airflow-ctl-tests \
--editable ./airflow-e2e-tests \
--editable ./devel-common[all] --editable ./dev \
diff --git a/setup_idea.py b/setup_idea.py
index 7fd9609732b..b94df61fe13 100755
--- a/setup_idea.py
+++ b/setup_idea.py
@@ -85,7 +85,7 @@ source_root_modules: list[str] = [
"docker-tests",
"kubernetes-tests",
"helm-tests",
- "task-sdk-tests",
+ "task-sdk-integration-tests",
]
all_module_paths: list[str] = []
diff --git a/task-sdk-tests/dags/test_asset_dag.py
b/task-sdk-integration-tests/dags/test_asset_dag.py
similarity index 100%
rename from task-sdk-tests/dags/test_asset_dag.py
rename to task-sdk-integration-tests/dags/test_asset_dag.py
diff --git a/task-sdk-tests/dags/test_dag.py
b/task-sdk-integration-tests/dags/test_dag.py
similarity index 100%
rename from task-sdk-tests/dags/test_dag.py
rename to task-sdk-integration-tests/dags/test_dag.py
diff --git a/task-sdk-tests/docker/docker-compose.yaml
b/task-sdk-integration-tests/docker/docker-compose.yaml
similarity index 100%
rename from task-sdk-tests/docker/docker-compose.yaml
rename to task-sdk-integration-tests/docker/docker-compose.yaml
diff --git a/task-sdk-tests/pyproject.toml
b/task-sdk-integration-tests/pyproject.toml
similarity index 93%
rename from task-sdk-tests/pyproject.toml
rename to task-sdk-integration-tests/pyproject.toml
index 1de482b3c87..86fdb792265 100644
--- a/task-sdk-tests/pyproject.toml
+++ b/task-sdk-integration-tests/pyproject.toml
@@ -21,8 +21,8 @@ requires = [ "hatchling==1.27.0" ]
build-backend = "hatchling.build"
[project]
-name = "apache-airflow-task-sdk-tests"
-description = "Task SDK tests for Apache Airflow"
+name = "apache-airflow-task-sdk-integration-tests"
+description = "Task SDK integration tests for Apache Airflow"
classifiers = [
"Private :: Do Not Upload",
]
diff --git a/task-sdk-tests/tests/task_sdk_tests/__init__.py
b/task-sdk-integration-tests/tests/task_sdk_tests/__init__.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/__init__.py
rename to task-sdk-integration-tests/tests/task_sdk_tests/__init__.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/conftest.py
b/task-sdk-integration-tests/tests/task_sdk_tests/conftest.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/conftest.py
rename to task-sdk-integration-tests/tests/task_sdk_tests/conftest.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/constants.py
b/task-sdk-integration-tests/tests/task_sdk_tests/constants.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/constants.py
rename to task-sdk-integration-tests/tests/task_sdk_tests/constants.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/jwt_plugin.py
b/task-sdk-integration-tests/tests/task_sdk_tests/jwt_plugin.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/jwt_plugin.py
rename to task-sdk-integration-tests/tests/task_sdk_tests/jwt_plugin.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/test_asset_event_operations.py
b/task-sdk-integration-tests/tests/task_sdk_tests/test_asset_event_operations.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/test_asset_event_operations.py
rename to
task-sdk-integration-tests/tests/task_sdk_tests/test_asset_event_operations.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/test_asset_operations.py
b/task-sdk-integration-tests/tests/task_sdk_tests/test_asset_operations.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/test_asset_operations.py
rename to
task-sdk-integration-tests/tests/task_sdk_tests/test_asset_operations.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/test_connection_operations.py
b/task-sdk-integration-tests/tests/task_sdk_tests/test_connection_operations.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/test_connection_operations.py
rename to
task-sdk-integration-tests/tests/task_sdk_tests/test_connection_operations.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/test_dag_run_operations.py
b/task-sdk-integration-tests/tests/task_sdk_tests/test_dag_run_operations.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/test_dag_run_operations.py
rename to
task-sdk-integration-tests/tests/task_sdk_tests/test_dag_run_operations.py
diff --git
a/task-sdk-tests/tests/task_sdk_tests/test_task_instance_operations.py
b/task-sdk-integration-tests/tests/task_sdk_tests/test_task_instance_operations.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/test_task_instance_operations.py
rename to
task-sdk-integration-tests/tests/task_sdk_tests/test_task_instance_operations.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/test_task_sdk_health.py
b/task-sdk-integration-tests/tests/task_sdk_tests/test_task_sdk_health.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/test_task_sdk_health.py
rename to
task-sdk-integration-tests/tests/task_sdk_tests/test_task_sdk_health.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/test_variable_operations.py
b/task-sdk-integration-tests/tests/task_sdk_tests/test_variable_operations.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/test_variable_operations.py
rename to
task-sdk-integration-tests/tests/task_sdk_tests/test_variable_operations.py
diff --git a/task-sdk-tests/tests/task_sdk_tests/test_xcom_operations.py
b/task-sdk-integration-tests/tests/task_sdk_tests/test_xcom_operations.py
similarity index 100%
rename from task-sdk-tests/tests/task_sdk_tests/test_xcom_operations.py
rename to
task-sdk-integration-tests/tests/task_sdk_tests/test_xcom_operations.py
