Improve handling of ansible-doc sanity errors.

pull/25795/merge
Matt Clay 7 years ago
parent e726c7ecf7
commit f9f6080630

@ -163,7 +163,7 @@ class DocCLI(CLI):
doc, plainexamples, returndocs, metadata = get_docstring(filename, fragment_loader, verbose=(self.options.verbosity > 0)) doc, plainexamples, returndocs, metadata = get_docstring(filename, fragment_loader, verbose=(self.options.verbosity > 0))
except: except:
display.vvv(traceback.format_exc()) display.vvv(traceback.format_exc())
display.error("%s %s has a documentation error formatting or is missing documentation." % (plugin_type, plugin)) display.error("%s %s has a documentation error formatting or is missing documentation." % (plugin_type, plugin), wrap_text=False)
continue continue
if doc is not None: if doc is not None:

@ -1,11 +1,14 @@
"""Sanity test for ansible-doc.""" """Sanity test for ansible-doc."""
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import re
from lib.sanity import ( from lib.sanity import (
SanityMultipleVersion, SanityMultipleVersion,
SanityFailure, SanityFailure,
SanitySuccess, SanitySuccess,
SanitySkipped, SanitySkipped,
SanityMessage,
) )
from lib.util import ( from lib.util import (
@ -42,9 +45,7 @@ class AnsibleDocTest(SanityMultipleVersion):
if not modules: if not modules:
return SanitySkipped(self.name, python_version=python_version) return SanitySkipped(self.name, python_version=python_version)
# ansible-doc fails due to async syntax errors on Python 3.7 currently module_paths = dict((t.module, t.path) for t in targets.targets if t.module)
if python_version == '3.7':
return SanitySkipped(self.name, python_version=python_version)
env = ansible_environment(args, color=False) env = ansible_environment(args, color=False)
cmd = ['ansible-doc'] + modules cmd = ['ansible-doc'] + modules
@ -57,6 +58,13 @@ class AnsibleDocTest(SanityMultipleVersion):
stderr = ex.stderr stderr = ex.stderr
status = ex.status status = ex.status
if stderr:
errors = stderr.strip().splitlines()
messages = [self.parse_error(e, module_paths) for e in errors]
if messages and all(messages):
return SanityFailure(self.name, messages=messages, python_version=python_version)
if status: if status:
summary = u'%s' % SubprocessError(cmd=cmd, status=status, stderr=stderr) summary = u'%s' % SubprocessError(cmd=cmd, status=status, stderr=stderr)
return SanityFailure(self.name, summary=summary, python_version=python_version) return SanityFailure(self.name, summary=summary, python_version=python_version)
@ -69,3 +77,30 @@ class AnsibleDocTest(SanityMultipleVersion):
return SanityFailure(self.name, summary=summary, python_version=python_version) return SanityFailure(self.name, summary=summary, python_version=python_version)
return SanitySuccess(self.name, python_version=python_version) return SanitySuccess(self.name, python_version=python_version)
@staticmethod
def parse_error(error, module_paths):
"""
:type error: str
:type module_paths: dict[str, str]
:rtype: SanityMessage | None
"""
# example error messages from lib/ansible/cli/doc.py:
# ERROR! module ping missing documentation (or could not parse documentation): expected string or buffer
# [ERROR]: module ping has a documentation error formatting or is missing documentation.
match = re.search(r'^[^ ]*ERROR[^ ]* (?P<type>[^ ]+) (?P<name>[^ ]+) (?P<text>.*)$', error)
if match:
groups = match.groupdict()
error_type = groups['type']
error_name = groups['name']
error_text = groups['text']
if error_type == 'module' and error_name in module_paths:
return SanityMessage(
message=error_text,
path=module_paths[error_name],
)
return None

Loading…
Cancel
Save