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

Tests: Fix framework log collection error

Browse source
This commit is contained in:
Renato Alves 2015-04-27 11:39:34 +01:00
parent 5f9a543b1b
commit fcfc95df86
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/basetest/taskd.py
View file

@ -254,10 +254,10 @@ class Taskd(object):
status)) status))
# Force stop so we can collect output # Force stop so we can collect output
self.stop() proc = self.stop()
# Collect output logs # Collect output logs
out, err = self.proc.communicate() out, err = proc.communicate()
self.show_log_contents() self.show_log_contents()
@ -269,6 +269,8 @@ class Taskd(object):
"""Stop the server by sending a SIGTERM and SIGKILL if fails to """Stop the server by sending a SIGTERM and SIGKILL if fails to
terminate. terminate.
If it's already stopped OSError will be raised If it's already stopped OSError will be raised
Returns: a reference to the old process object
""" """
if self.proc is None: if self.proc is None:
raise OSError("Taskd server is not running") raise OSError("Taskd server is not running")
@ -282,9 +284,14 @@ class Taskd(object):
# Wait for process to end to avoid zombies # Wait for process to end to avoid zombies
self.proc.wait() self.proc.wait()
# Keep a reference to the old process
proc = self.proc
# Unset the process to inform that no process is running # Unset the process to inform that no process is running
self.proc = None self.proc = None
return proc
def _check_pid(self): def _check_pid(self):
"Check if self.proc is still running and a PID still exists" "Check if self.proc is still running and a PID still exists"
# Wait ~1 sec for taskd to finish # Wait ~1 sec for taskd to finish