[airflow] 03/04: Correctly deserialize dagrun_timeout field on DAGs (#8735)

[kaxilnaik]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit ddbb15d80c61486b450a51263b67c0c4413251c0
Author: Ash Berlin-Taylor <ash_git...@firemirror.com>
AuthorDate: Wed May 6 18:33:06 2020 +0100

    Correctly deserialize dagrun_timeout field on DAGs (#8735)
    
    We weren't deserializing this correctly (it was left as a float) but
    nothing _was_ using it, and we hadn't explicitly tested it.
    
    We already have example dags with this field, so we just need to check
    for this field.
    
    (cherry picked from commit 336aa271e324574bb17cff29bee7b36e4de8e317)
---
 airflow/serialization/serialized_objects.py   | 2 +-
 tests/serialization/test_dag_serialization.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/airflow/serialization/serialized_objects.py 
b/airflow/serialization/serialized_objects.py
index 3d2029a..917d80f 100644
--- a/airflow/serialization/serialized_objects.py
+++ b/airflow/serialization/serialized_objects.py
@@ -548,7 +548,7 @@ class SerializedDAG(DAG, BaseSerialization):
                 k = "task_dict"
             elif k == "timezone":
                 v = cls._deserialize_timezone(v)
-            elif k in {"retry_delay", "execution_timeout"}:
+            elif k in {"dagrun_timeout"}:
                 v = cls._deserialize_timedelta(v)
             elif k.endswith("_date"):
                 v = cls._deserialize_datetime(v)
diff --git a/tests/serialization/test_dag_serialization.py 
b/tests/serialization/test_dag_serialization.py
index b0c0d2e..52f6e1a 100644
--- a/tests/serialization/test_dag_serialization.py
+++ b/tests/serialization/test_dag_serialization.py
@@ -297,7 +297,7 @@ class TestStringifiedDAGs(unittest.TestCase):
             "params", "fileloc", "max_active_runs", "concurrency",
             "is_paused_upon_creation", "doc_md", "safe_dag_id", "is_subdag",
             "catchup", "description", "start_date", "end_date", "parent_dag",
-            "template_searchpath", "_access_control"
+            "template_searchpath", "_access_control", "dagrun_timeout"
         ]
 
         # fields_to_check = dag.get_serialized_fields()