提交 1cd616c4 编写于 作者: L Lukáš Doktor

avocado.core.remote: Ignore `\r` when checking for avocado

The `re.MULTILINE` breaks the strings by `\n` but it ignores `\r`. Let's
accept optional `\r` at the end of the line. This helps when some broken
plugin spits additional lines after `avocado -v` output.
Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>
上级 ee996eb9
......@@ -42,7 +42,7 @@ class RemoteTestRunner(TestRunner):
# Let's use re.MULTILINE because sometimes servers might have MOTD
# that will introduce a line break on output.
remote_version_re = re.compile(r'^Avocado (\d+)\.(\d+)$',
remote_version_re = re.compile(r'^Avocado (\d+)\.(\d+)\r?$',
re.MULTILINE)
def __init__(self, job, test_result):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册