Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace validate-modules's semantic markup parser with antsibull-docs-parser #80406

Merged
merged 4 commits into from Apr 6, 2023
Merged

Replace validate-modules's semantic markup parser with antsibull-docs-parser #80406

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61e6b32
Replace validate-modules's semantic markup parser with antsibull-docs…
felixfontein Apr 5, 2023
4f7c0df
Avoid import errors in unit tests.
felixfontein Apr 5, 2023
07f6da2
Revert "Avoid import errors in unit tests."
mattclay Apr 5, 2023
77eafcc
Mock out `antsibull_docs_parser` in unit tests
mattclay Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions test/lib/ansible_test/_util/controller/sanity/validate-modules/validate_modules/main.py
View file
Open in desktop
Expand Up @@ -33,8 +33,14 @@
from contextlib import contextmanager
from fnmatch import fnmatch

from antsibull_docs_parser import dom
from antsibull_docs_parser.parser import parse, Context
try:
from antsibull_docs_parser import dom
from antsibull_docs_parser.parser import parse, Context
except ImportError:
import traceback
ANTSIBULL_DOCS_PARSER_FAILURE = traceback.format_exc()
else:
ANTSIBULL_DOCS_PARSER_FAILURE = None
mattclay marked this conversation as resolved.
Show resolved Hide resolved

import yaml

Expand Down Expand Up @@ -2611,6 +2617,10 @@ def run():


def main():
if ANTSIBULL_DOCS_PARSER_FAILURE is not None:
print('FATAL ERROR: Cannot import antsibull-docs-parser')
print(ANTSIBULL_DOCS_PARSER_FAILURE)
sys.exit(255)
try:
run()
except KeyboardInterrupt:
Expand Down
8 changes: 6 additions & 2 deletions test/lib/ansible_test/_util/controller/sanity/validate-modules/validate_modules/schema.py
View file
Open in desktop
Expand Up @@ -20,8 +20,12 @@
from ansible.utils.version import SemanticVersion
from ansible.release import __version__

from antsibull_docs_parser import dom
from antsibull_docs_parser.parser import parse, Context
try:
from antsibull_docs_parser import dom
from antsibull_docs_parser.parser import parse, Context
except ImportError:
# Handled in main.py
pass

from .utils import parse_isodate

Expand Down