From e26e58a77f4a89f7b838aacad801d04fc194f953 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 5 Mar 2019 00:46:24 +0800 Subject: [PATCH] ansible.py: catch yaml.YAMLError when yaml.safe_load() yaml.safe_load() also throws yaml.scanner.ScannerError. so use yaml.YAMLError to cover them all. see https://pyyaml.org/wiki/PyYAMLDocumentation . Signed-off-by: Kefu Chai --- teuthology/task/ansible.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/task/ansible.py b/teuthology/task/ansible.py index dfc009feb..1b535e58d 100644 --- a/teuthology/task/ansible.py +++ b/teuthology/task/ansible.py @@ -306,10 +306,10 @@ class Ansible(Task): with open(self.failure_log.name, 'r') as fail_log: try: failures = yaml.safe_load(fail_log) - except yaml.parser.ParserError: + except yaml.YAMLError as e: log.error( - "Failed to parse ansible failure log: {0}".format( - self.failure_log.name, + "Failed to parse ansible failure log: {0} ({1})".format( + self.failure_log.name, e ) ) failures = fail_log.read().replace('\n', '') -- 2.47.3