From 2555ee35344c3808a2d819144e9bce5af9d8fc2a Mon Sep 17 00:00:00 2001
From: Akash Sharma <2akash111998@gmail.com>
Date: Wed, 5 Jul 2023 11:14:20 +0530
Subject: [PATCH 1/2] try_number fix
---
airflow/www/views.py | 3 ++-
tests/www/views/test_views_tasks.py | 9 +++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 3f0965da38898..d7059156f5754 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -1801,7 +1801,8 @@ def task(self, session: Session = NEW_SESSION):
with warnings.catch_warnings():
warnings.simplefilter("ignore", RemovedInAirflow3Warning)
all_ti_attrs = (
- (name, getattr(ti, name))
+ # fetching the value of _try_number to be shown under name try_number in UI
+ (name, getattr(ti, "_try_number" if name == "try_number" else name))
for name in dir(ti)
if not name.startswith("_") and name not in ti_attrs_to_skip
)
diff --git a/tests/www/views/test_views_tasks.py b/tests/www/views/test_views_tasks.py
index 8ed0ba825a3e2..3330b1f7e5408 100644
--- a/tests/www/views/test_views_tasks.py
+++ b/tests/www/views/test_views_tasks.py
@@ -323,6 +323,15 @@ def test_views_get(admin_client, url, contents):
check_content_in_response(content, resp)
+def test_views_task(admin_client):
+ url = f"task?task_id=runme_0&dag_id=example_bash_operator&execution_date={DEFAULT_VAL}"
+ resp = admin_client.get(url, follow_redirects=True)
+ resp_html = resp.data.decode("utf-8")
+ assert resp.status_code == 200
+ assert "| _try_number | " not in resp_html
+ assert "try_number | " in resp_html
+
+
def test_rendered_k8s(admin_client):
url = f"rendered-k8s?task_id=runme_0&dag_id=example_bash_operator&execution_date={DEFAULT_VAL}"
with unittest.mock.patch.object(settings, "IS_K8S_OR_K8SCELERY_EXECUTOR", True):
From 9a651caf608684e462a52fe4aea744fc0b57fd10 Mon Sep 17 00:00:00 2001
From: Akash Sharma <2akash111998@gmail.com>
Date: Wed, 5 Jul 2023 11:21:08 +0530
Subject: [PATCH 2/2] change test name
---
tests/www/views/test_views_tasks.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/www/views/test_views_tasks.py b/tests/www/views/test_views_tasks.py
index 3330b1f7e5408..21c573fe5049b 100644
--- a/tests/www/views/test_views_tasks.py
+++ b/tests/www/views/test_views_tasks.py
@@ -323,7 +323,7 @@ def test_views_get(admin_client, url, contents):
check_content_in_response(content, resp)
-def test_views_task(admin_client):
+def test_rendered_task_view(admin_client):
url = f"task?task_id=runme_0&dag_id=example_bash_operator&execution_date={DEFAULT_VAL}"
resp = admin_client.get(url, follow_redirects=True)
resp_html = resp.data.decode("utf-8")