未验证 提交 f42bcc2d 编写于 作者: C Cleber Rosa

Merge remote-tracking branch 'apahim/disable_travis_paralel'

Signed-off-by: NCleber Rosa <crosa@redhat.com>
......@@ -46,7 +46,7 @@ script:
echo
echo
git checkout $COMMIT || ERR=$(echo -e "$ERR\nUnable to checkout $(git log -1 --oneline $COMMIT)")
AVOCADO_PARALLEL_CHECK=yes AVOCADO_LOG_DEBUG=yes AVOCADO_RESULTSDIR_CHECK=y SELF_CHECK_CONTINUOUS=y AVOCADO_CHECK_LEVEL=1 make check || ERR=$(echo -e "$ERR\nmake check of $(git log -1 --oneline) failed")
AVOCADO_LOG_DEBUG=yes AVOCADO_RESULTSDIR_CHECK=y SELF_CHECK_CONTINUOUS=y AVOCADO_CHECK_LEVEL=1 make check || ERR=$(echo -e "$ERR\nmake check of $(git log -1 --oneline) failed")
make clean
done
if [ "$ERR" ]; then
......
......@@ -293,7 +293,7 @@ class CmdResult(object):
class FDDrainer(object):
def __init__(self, fd, result, name=None, logger=None, logger_prefix='',
def __init__(self, fd, result, name=None, logger=None, logger_prefix='%s',
stream_logger=None, ignore_bg_processes=False, verbose=False):
"""
Reads data from a file descriptor in a thread, storing locally in
......@@ -308,7 +308,7 @@ class FDDrainer(object):
:param name: a descriptive name that will be passed to the Thread name
:type name: str
:param logger_prefix: the prefix used when logging the data
:type logger_prefix: str
:type logger_prefix: str with one %-style string formatter
:param ignore_bg_processes: When True the process does not wait for
child processes which keep opened stdout/stderr streams
after the main process finishes (eg. forked daemon which
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册