提交 f1f7dba1 编写于 作者: R Rudá Moura 提交者: Rudá Moura

Merge pull request #91 from avocado-framework/fix-syslog-bug

Fix syslog bug
......@@ -56,7 +56,7 @@ def get_paginator():
try:
less_cmd = process.find_command('less')
return os.popen('%s -FRSX' % less_cmd, 'w')
except ValueError:
except process.CmdNotFoundError:
return sys.stdout
......
......@@ -393,7 +393,10 @@ class SysInfo(object):
# As the system log path is not standardized between distros,
# we have to probe and find out the correct path.
self.end_test_loggables.add(self._get_syslog_watcher())
try:
self.end_test_loggables.add(self._get_syslog_watcher())
except ValueError, details:
log.info(details)
for filename in _DEFAULT_FILES_START_TEST:
self.start_test_loggables.add(Logfile(filename))
......
......@@ -295,6 +295,7 @@ class Test(unittest.TestCase):
raise exceptions.TestSetupFail(cleanup_exception)
self.status = 'PASS'
sysinfo_logger.end_test_hook()
def run_avocado(self, result=None):
"""
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册