From a707466c0b919e686aa54814182bd4559fccaa0d Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Thu, 18 Jun 2020 09:27:05 -0700
Subject: [PATCH] [stable-2.10] Fix yamllint sanity test line numbers.

Parse errors from libyaml now compensate for the offset of the documentation within a module.
(cherry picked from commit 1a0d8a51cd0e1abfc4e6ba6e0ee715a0900d430b)

Co-authored-by: Matt Clay <matt@mystile.com>
---
 .../fragments/ansible-test-sanity-yamllint-lineno.yml      | 2 ++
 test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py  | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/ansible-test-sanity-yamllint-lineno.yml

diff --git a/changelogs/fragments/ansible-test-sanity-yamllint-lineno.yml b/changelogs/fragments/ansible-test-sanity-yamllint-lineno.yml
new file mode 100644
index 00000000000..1111042cd68
--- /dev/null
+++ b/changelogs/fragments/ansible-test-sanity-yamllint-lineno.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - ansible-test - Report the correct line number in the ``yamllint`` sanity test when reporting ``libyaml`` parse errors in module documentation.
diff --git a/test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py b/test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py
index 8eafec8ed34..933debe707a 100644
--- a/test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py
+++ b/test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py
@@ -119,16 +119,17 @@ class YamlChecker:
                 yaml_data = yaml_data[1:]
                 lineno += 1
 
-            self.check_parsable(path, yaml_data)
+            self.check_parsable(path, yaml_data, lineno)
 
             messages = list(linter.run(yaml_data, conf, path))
 
             self.messages += [self.result_to_message(r, path, lineno - 1, key) for r in messages]
 
-    def check_parsable(self, path, contents):
+    def check_parsable(self, path, contents, lineno=1):
         """
         :type path: str
         :type contents: str
+        :type lineno: int
         """
         try:
             yaml.load(contents, Loader=TestLoader)
@@ -136,7 +137,7 @@ class YamlChecker:
             self.messages += [{'code': 'unparsable-with-libyaml',
                                'message': '%s - %s' % (e.args[0], e.args[2]),
                                'path': path,
-                               'line': e.problem_mark.line + 1,
+                               'line': e.problem_mark.line + lineno,
                                'column': e.problem_mark.column + 1,
                                'level': 'error',
                                }]