Merge branch '2.4.4' of ssh://git.tasktools.org/tm/task into 2.4.4

This commit is contained in:
Paul Beckingham 2015-04-26 10:34:40 -04:00
commit c62ba68f10

View file

@ -147,7 +147,7 @@ class Task(object):
return f.readlines()
def runSuccess(self, args=(), input=None, merge_streams=False,
timeout=1):
timeout=5):
"""Invoke task with given arguments and fail if exit code != 0
Use runError if you want exit_code to be tested automatically and
@ -179,7 +179,7 @@ class Task(object):
return output
def runError(self, args=(), input=None, merge_streams=False, timeout=1):
def runError(self, args=(), input=None, merge_streams=False, timeout=5):
"""Invoke task with given arguments and fail if exit code == 0
Use runSuccess if you want exit_code to be tested automatically and