GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Output taskd.log to stdout on taskd failures (not test errors)

Browse source
This commit is contained in:
Renato Alves 2015-04-25 23:48:59 +01:00
parent b91a4b4982
commit a52bba46f1
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
test/basetest/taskd.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division from __future__ import division, print_function
import os import os
import tempfile import tempfile
import shutil import shutil
@ -207,6 +207,8 @@ class Taskd(object):
self.proc = Popen(cmd, stdout=PIPE, stderr=PIPE, stdin=DEVNULL, self.proc = Popen(cmd, stdout=PIPE, stderr=PIPE, stdin=DEVNULL,
env=self.env) env=self.env)
else: else:
self.show_log_contents()
raise OSError("Taskd server is still running or crashed") raise OSError("Taskd server is still running or crashed")
# Wait for server to listen by checking connectivity in the port # Wait for server to listen by checking connectivity in the port
@ -218,6 +220,8 @@ class Taskd(object):
return return
elif status == self.TASKD_NEVER_STARTED: elif status == self.TASKD_NEVER_STARTED:
self.show_log_contents()
raise OSError("Task server was never started. " raise OSError("Task server was never started. "
"This shouldn't happen!!") "This shouldn't happen!!")
@ -225,6 +229,8 @@ class Taskd(object):
# Collect output logs # Collect output logs
out, err = self.proc.communicate() out, err = self.proc.communicate()
self.show_log_contents()
raise OSError( raise OSError(
"Task server launched with '{0}' crashed or exited " "Task server launched with '{0}' crashed or exited "
"prematurely. Exit code: {1}. " "prematurely. Exit code: {1}. "
@ -242,6 +248,8 @@ class Taskd(object):
sleep(1 / tries_per_minute) sleep(1 / tries_per_minute)
else: else:
self.show_log_contents()
raise OSError("Unknown running status for taskd '{0}'".format( raise OSError("Unknown running status for taskd '{0}'".format(
status)) status))
@ -251,6 +259,8 @@ class Taskd(object):
# Collect output logs # Collect output logs
out, err = self.proc.communicate() out, err = self.proc.communicate()
self.show_log_contents()
raise OSError("Task server didn't start and listen on port {0} after " raise OSError("Task server didn't start and listen on port {0} after "
"{1} minutes. Stdout: {2!r}. Stderr: {3!r}.".format( "{1} minutes. Stdout: {2!r}. Stderr: {3!r}.".format(
self.port, minutes, out, err)) self.port, minutes, out, err))
@ -339,4 +349,14 @@ class Taskd(object):
return parse_datafile(file) return parse_datafile(file)
def show_log_contents(self):
"""Print to to STDOUT the contents of taskd.log
"""
if os.path.isfile(self.tasklog):
with open(self.tasklog) as fh:
print("#### Start taskd.log ####")
for line in fh:
print(line, end='')
print("#### End taskd.log ####")
# vim: ai sts=4 et sw=4 # vim: ai sts=4 et sw=4