Repository: incubator-airflow
Updated Branches:
refs/heads/master 97a2393f6 -> 2da485681
[AIRFLOW-1692] Change test_views filename to support Windows
Closes #2673 from NielsZeilemaker/AIRFLOW-1692
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/2da48568
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/2da48568
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/2da48568
Branch: refs/heads/master
Commit: 2da48568116f7382258e2678e20ee0f9573d653c
Parents: 97a2393
Author: root <root@DESKTOP-2VL398N.localdomain>
Authored: Wed Oct 18 21:49:58 2017 +0200
Committer: Bolke de Bruin <bolke@xs4all.nl>
Committed: Wed Oct 18 21:50:14 2017 +0200
----------------------------------------------------------------------
.../task_for_testing_log_view/2017-09-01T00.00.00/1.log | 1 +
.../task_for_testing_log_view/2017-09-01T00:00:00/1.log | 1 -
tests/www/test_views.py | 2 ++
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/2da48568/tests/www/test_logs/dag_for_testing_log_view/task_for_testing_log_view/2017-09-01T00.00.00/1.log
----------------------------------------------------------------------
diff --git a/tests/www/test_logs/dag_for_testing_log_view/task_for_testing_log_view/2017-09-01T00.00.00/1.log
b/tests/www/test_logs/dag_for_testing_log_view/task_for_testing_log_view/2017-09-01T00.00.00/1.log
new file mode 100644
index 0000000..bc10ef7
--- /dev/null
+++ b/tests/www/test_logs/dag_for_testing_log_view/task_for_testing_log_view/2017-09-01T00.00.00/1.log
@@ -0,0 +1 @@
+Log for testing.
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/2da48568/tests/www/test_logs/dag_for_testing_log_view/task_for_testing_log_view/2017-09-01T00:00:00/1.log
----------------------------------------------------------------------
diff --git a/tests/www/test_logs/dag_for_testing_log_view/task_for_testing_log_view/2017-09-01T00:00:00/1.log
b/tests/www/test_logs/dag_for_testing_log_view/task_for_testing_log_view/2017-09-01T00:00:00/1.log
deleted file mode 100644
index bc10ef7..0000000
--- a/tests/www/test_logs/dag_for_testing_log_view/task_for_testing_log_view/2017-09-01T00:00:00/1.log
+++ /dev/null
@@ -1 +0,0 @@
-Log for testing.
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/2da48568/tests/www/test_views.py
----------------------------------------------------------------------
diff --git a/tests/www/test_views.py b/tests/www/test_views.py
index 553e7cc..4931487 100644
--- a/tests/www/test_views.py
+++ b/tests/www/test_views.py
@@ -328,6 +328,8 @@ class TestLogView(unittest.TestCase):
current_dir = os.path.dirname(os.path.abspath(__file__))
logging_config['handlers']['file.task']['base_log_folder'] = os.path.normpath(
os.path.join(current_dir, 'test_logs'))
+ logging_config['handlers']['file.task']['filename_template'] = \
+ '{{ ti.dag_id }}/{{ ti.task_id }}/{{ ts | replace(":", ".") }}/{{ try_number
}}.log'
# Write the custom logging configuration to a file
self.settings_folder = tempfile.mkdtemp()
|