You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by da...@apache.org on 2017/01/20 01:35:16 UTC
incubator-airflow git commit: [AIRFLOW-773] Fix flaky datetime
addition in api test
Repository: incubator-airflow
Updated Branches:
refs/heads/master b56cb5cc9 -> a3927e239
[AIRFLOW-773] Fix flaky datetime addition in api test
Please accept this PR that addresses the following
issues:
-
https://issues.apache.org/jira/browse/AIRFLOW-773
There is an API test in
www/api/experimental/test_endpoints.py that adds
one to a datetime incorrectly (e.g. hours = 24 + 1
is incorrect). This causes travis CI to always
fail for one hour of the day.
Closes #2004 from
aoen/ddavydov/fix_flaky_datetime_tet
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/a3927e23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/a3927e23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/a3927e23
Branch: refs/heads/master
Commit: a3927e239af6a5fa74f6033c5f00d37f025c708a
Parents: b56cb5c
Author: Dan Davydov <da...@airbnb.com>
Authored: Thu Jan 19 17:27:42 2017 -0800
Committer: Dan Davydov <da...@airbnb.com>
Committed: Thu Jan 19 17:27:44 2017 -0800
----------------------------------------------------------------------
tests/www/api/experimental/test_endpoints.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/a3927e23/tests/www/api/experimental/test_endpoints.py
----------------------------------------------------------------------
diff --git a/tests/www/api/experimental/test_endpoints.py b/tests/www/api/experimental/test_endpoints.py
index bc41171..2134a44 100644
--- a/tests/www/api/experimental/test_endpoints.py
+++ b/tests/www/api/experimental/test_endpoints.py
@@ -13,7 +13,7 @@
# limitations under the License.
import unittest
-from datetime import datetime
+from datetime import datetime, timedelta
from airflow.models import DagBag
import json
@@ -34,7 +34,7 @@ class ApiExperimentalTests(unittest.TestCase):
assert '"email"' in response.data.decode('utf-8')
assert 'error' not in response.data.decode('utf-8')
self.assertEqual(200, response.status_code)
-
+
response = self.app.get(url_template.format('example_bash_operator', 'DNE'))
assert 'error' in response.data.decode('utf-8')
self.assertEqual(404, response.status_code)
@@ -63,14 +63,17 @@ class ApiExperimentalTests(unittest.TestCase):
def test_trigger_dag_for_date(self):
url_template = '/api/experimental/dags/{}/dag_runs'
dag_id = 'example_bash_operator'
- now = datetime.now()
- execution_date = datetime(now.year, now.month, now.day, now.hour + 1)
+ hour_from_now = datetime.now() + timedelta(hours=1)
+ execution_date = datetime(hour_from_now.year,
+ hour_from_now.month,
+ hour_from_now.day,
+ hour_from_now.hour)
datetime_string = execution_date.isoformat()
# Test Correct execution
response = self.app.post(
url_template.format(dag_id),
- data=json.dumps(dict(execution_date=execution_date.isoformat())),
+ data=json.dumps(dict(execution_date=datetime_string)),
content_type="application/json"
)
self.assertEqual(200, response.status_code)
@@ -97,4 +100,3 @@ class ApiExperimentalTests(unittest.TestCase):
content_type="application/json"
)
self.assertEqual(400, response.status_code)
-