Merge "Ansible launcher: clean up result handling"
diff --git a/other-requirements.txt b/other-requirements.txt
new file mode 100644
index 0000000..1ade655
--- /dev/null
+++ b/other-requirements.txt
@@ -0,0 +1,4 @@
+mysql-client [test]
+mysql-server [test]
+postgresql [test]
+postgresql-client [test]
diff --git a/tox.ini b/tox.ini
index a8767c2..06ccbcd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,14 @@
commands =
python setup.py testr --slowest --testr-args='{posargs}'
+[testenv:bindep]
+# Do not install any requirements. We want this to be fast and work even if
+# system dependencies are missing, since it's used to tell you what system
+# dependencies are missing! This also means that bindep must be installed
+# separately, outside of the requirements files.
+deps = bindep
+commands = bindep test
+
[testenv:pep8]
# streamer is python3 only, so we need to run flake8 in python3
basepython = python3
diff --git a/zuul/ansible/library/zuul_runner.py b/zuul/ansible/library/zuul_runner.py
index 5a38807..7689fb3 100644
--- a/zuul/ansible/library/zuul_runner.py
+++ b/zuul/ansible/library/zuul_runner.py
@@ -31,8 +31,12 @@
self.logfile.close()
def addLine(self, ln):
+ # Note this format with deliminator is "inspired" by the old
+ # Jenkins format but with microsecond resolution instead of
+ # millisecond. It is kept so log parsing/formatting remains
+ # consistent.
ts = datetime.datetime.now()
- outln = '%s %s' % (str(ts), ln)
+ outln = '%s | %s' % (ts, ln)
self.logfile.write(outln)