internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge doc fragments in earlier (#52193)

Browse Source 
* Merge doc fragments in earlier

* Move it even higher

* Remove errant docs key

* Fix type
This commit is contained in:
Matt Martz
2019-02-19 09:02:12 -06:00
committed by GitHub
parent 19f069c041
commit b54086ef02
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/sanity/validate-modules/main.py
View File

@@ -985,6 +985,8 @@ class ModuleValidator(Validator):
msg='Unknown DOCUMENTATION error, see TRACE: %s' % e
)
add_fragments(doc, self.object_path, fragment_loader=fragment_loader)
if 'options' in doc and doc['options'] is None:
self.reporter.error(
path=self.object_path,
@@ -1005,8 +1007,6 @@ class ModuleValidator(Validator):
# This is the normal case
self._validate_docs_schema(doc, doc_schema(self.object_name.split('.')[0]), 'DOCUMENTATION', 305)
add_fragments(doc, self.object_path, fragment_loader=fragment_loader)
existing_doc = self._check_for_new_args(doc, metadata)
self._check_version_added(doc, existing_doc)