From 7cd3cd5f0f0393459ef746009ab80c27296eb49e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 19 Sep 2024 06:57:08 +0200
Subject: Merging upstream version 7.4.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/roots/test-ext-coverage/conf.py              |  5 ++++-
 tests/roots/test-ext-coverage/coverage_ignored.py  | 22 ----------------------
 .../test-ext-coverage/coverage_not_ignored.py      | 22 ----------------------
 tests/roots/test-ext-coverage/grog/__init__.py     |  0
 .../test-ext-coverage/grog/coverage_ignored.py     | 22 ++++++++++++++++++++++
 .../test-ext-coverage/grog/coverage_missing.py     |  7 +++++++
 .../test-ext-coverage/grog/coverage_not_ignored.py | 22 ++++++++++++++++++++++
 tests/roots/test-ext-coverage/index.rst            |  4 ++--
 8 files changed, 57 insertions(+), 47 deletions(-)
 delete mode 100644 tests/roots/test-ext-coverage/coverage_ignored.py
 delete mode 100644 tests/roots/test-ext-coverage/coverage_not_ignored.py
 create mode 100644 tests/roots/test-ext-coverage/grog/__init__.py
 create mode 100644 tests/roots/test-ext-coverage/grog/coverage_ignored.py
 create mode 100644 tests/roots/test-ext-coverage/grog/coverage_missing.py
 create mode 100644 tests/roots/test-ext-coverage/grog/coverage_not_ignored.py

(limited to 'tests/roots/test-ext-coverage')

diff --git a/tests/roots/test-ext-coverage/conf.py b/tests/roots/test-ext-coverage/conf.py
index d3ec6e8..70fd03e 100644
--- a/tests/roots/test-ext-coverage/conf.py
+++ b/tests/roots/test-ext-coverage/conf.py
@@ -5,8 +5,11 @@ sys.path.insert(0, os.path.abspath('.'))
 
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.coverage']
 
+coverage_modules = [
+    'grog',
+]
 coverage_ignore_pyobjects = [
-    r'^coverage_ignored(\..*)?$',
+    r'^grog\.coverage_ignored(\..*)?$',
     r'\.Ignored$',
     r'\.Documented\.ignored\d$',
 ]
diff --git a/tests/roots/test-ext-coverage/coverage_ignored.py b/tests/roots/test-ext-coverage/coverage_ignored.py
deleted file mode 100644
index b762955..0000000
--- a/tests/roots/test-ext-coverage/coverage_ignored.py
+++ /dev/null
@@ -1,22 +0,0 @@
-class Documented:
-    """Documented"""
-
-    def ignored1(self):
-        pass
-
-    def ignored2(self):
-        pass
-
-    def not_ignored1(self):
-        pass
-
-    def not_ignored2(self):
-        pass
-
-
-class Ignored:
-    pass
-
-
-class NotIgnored:
-    pass
diff --git a/tests/roots/test-ext-coverage/coverage_not_ignored.py b/tests/roots/test-ext-coverage/coverage_not_ignored.py
deleted file mode 100644
index b762955..0000000
--- a/tests/roots/test-ext-coverage/coverage_not_ignored.py
+++ /dev/null
@@ -1,22 +0,0 @@
-class Documented:
-    """Documented"""
-
-    def ignored1(self):
-        pass
-
-    def ignored2(self):
-        pass
-
-    def not_ignored1(self):
-        pass
-
-    def not_ignored2(self):
-        pass
-
-
-class Ignored:
-    pass
-
-
-class NotIgnored:
-    pass
diff --git a/tests/roots/test-ext-coverage/grog/__init__.py b/tests/roots/test-ext-coverage/grog/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/roots/test-ext-coverage/grog/coverage_ignored.py b/tests/roots/test-ext-coverage/grog/coverage_ignored.py
new file mode 100644
index 0000000..b762955
--- /dev/null
+++ b/tests/roots/test-ext-coverage/grog/coverage_ignored.py
@@ -0,0 +1,22 @@
+class Documented:
+    """Documented"""
+
+    def ignored1(self):
+        pass
+
+    def ignored2(self):
+        pass
+
+    def not_ignored1(self):
+        pass
+
+    def not_ignored2(self):
+        pass
+
+
+class Ignored:
+    pass
+
+
+class NotIgnored:
+    pass
diff --git a/tests/roots/test-ext-coverage/grog/coverage_missing.py b/tests/roots/test-ext-coverage/grog/coverage_missing.py
new file mode 100644
index 0000000..2fe4433
--- /dev/null
+++ b/tests/roots/test-ext-coverage/grog/coverage_missing.py
@@ -0,0 +1,7 @@
+"""This module is intentionally not documented."""
+
+class Missing:
+    """An undocumented class."""
+
+    def missing_a(self):
+        """An undocumented method."""
diff --git a/tests/roots/test-ext-coverage/grog/coverage_not_ignored.py b/tests/roots/test-ext-coverage/grog/coverage_not_ignored.py
new file mode 100644
index 0000000..b762955
--- /dev/null
+++ b/tests/roots/test-ext-coverage/grog/coverage_not_ignored.py
@@ -0,0 +1,22 @@
+class Documented:
+    """Documented"""
+
+    def ignored1(self):
+        pass
+
+    def ignored2(self):
+        pass
+
+    def not_ignored1(self):
+        pass
+
+    def not_ignored2(self):
+        pass
+
+
+class Ignored:
+    pass
+
+
+class NotIgnored:
+    pass
diff --git a/tests/roots/test-ext-coverage/index.rst b/tests/roots/test-ext-coverage/index.rst
index b846898..85dccf9 100644
--- a/tests/roots/test-ext-coverage/index.rst
+++ b/tests/roots/test-ext-coverage/index.rst
@@ -1,6 +1,6 @@
-.. automodule:: coverage_ignored
+.. automodule:: grog.coverage_ignored
    :members:
 
 
-.. automodule:: coverage_not_ignored
+.. automodule:: grog.coverage_not_ignored
    :members:
-- 
cgit v1.2.3