You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2020/06/22 22:49:36 UTC
[airflow] branch v1-10-test updated: fixup! [AIRFLOW-8902] Fix Dag
Run UI execution date with timezone cannot be saved issue (#8902)
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
The following commit(s) were added to refs/heads/v1-10-test by this push:
new c0be8c4 fixup! [AIRFLOW-8902] Fix Dag Run UI execution date with timezone cannot be saved issue (#8902)
c0be8c4 is described below
commit c0be8c4a93eefa60a09069af41d9fbca713d82e1
Author: Kaxil Naik <ka...@gmail.com>
AuthorDate: Mon Jun 22 23:45:45 2020 +0100
fixup! [AIRFLOW-8902] Fix Dag Run UI execution date with timezone cannot be saved issue (#8902)
---
tests/www_rbac/test_views.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/www_rbac/test_views.py b/tests/www_rbac/test_views.py
index fb48cfe..d5eb040 100644
--- a/tests/www_rbac/test_views.py
+++ b/tests/www_rbac/test_views.py
@@ -28,7 +28,7 @@ import sys
import tempfile
import unittest
import urllib
-from datetime import datetime as dt, timedelta, timezone as tz
+from datetime import datetime as dt, timedelta
import pytest
import six
@@ -2503,7 +2503,7 @@ class TestDagRunModelView(TestBase):
dr = self.session.query(models.DagRun).one()
- self.assertEqual(dr.execution_date, dt(2018, 7, 6, 5, 4, 3, tzinfo=tz.utc))
+ self.assertEqual(dr.execution_date, timezone.datetime(2018, 7, 6, 5, 4, 3))
def test_create_dagrun_execution_date_with_timezone_edt(self):
data = {
@@ -2519,7 +2519,7 @@ class TestDagRunModelView(TestBase):
dr = self.session.query(models.DagRun).one()
- self.assertEqual(dr.execution_date, dt(2018, 7, 6, 5, 4, 3, tzinfo=tz(timedelta(hours=-4))))
+ self.assertEqual(dr.execution_date, timezone.datetime(2018, 7, 6, 9, 4, 3))
def test_create_dagrun_execution_date_with_timezone_pst(self):
data = {
@@ -2535,7 +2535,7 @@ class TestDagRunModelView(TestBase):
dr = self.session.query(models.DagRun).one()
- self.assertEqual(dr.execution_date, dt(2018, 7, 6, 5, 4, 3, tzinfo=tz(timedelta(hours=-8))))
+ self.assertEqual(dr.execution_date, timezone.datetime(2018, 7, 6, 13, 4, 3))
@conf_vars({("core", "default_timezone"): "America/Toronto"})
def test_create_dagrun_execution_date_without_timezone_default_edt(self):
@@ -2552,7 +2552,7 @@ class TestDagRunModelView(TestBase):
dr = self.session.query(models.DagRun).one()
- self.assertEqual(dr.execution_date, dt(2018, 7, 6, 5, 4, 3, tzinfo=tz(timedelta(hours=-4))))
+ self.assertEqual(dr.execution_date, timezone.datetime(2018, 7, 6, 5, 4, 3))
def test_create_dagrun_execution_date_without_timezone_default_utc(self):
data = {
@@ -2568,7 +2568,7 @@ class TestDagRunModelView(TestBase):
dr = self.session.query(models.DagRun).one()
- self.assertEqual(dr.execution_date, dt(2018, 7, 6, 5, 4, 3, tzinfo=tz.utc))
+ self.assertEqual(dr.execution_date, dt(2018, 7, 6, 5, 4, 3, tzinfo=timezone.TIMEZONE))
def test_create_dagrun_valid_conf(self):
conf_value = dict(Valid=True)