From 9e4bc3c0692bcb414bd4ebd07fcee2446f00b2ce Mon Sep 17 00:00:00 2001 From: Radislav Chugunov Date: Sat, 6 May 2023 16:42:19 +0300 Subject: [PATCH 1/3] Fix doctest loading in `test_enum` * remove invalid doc file existence check * mark path to doc as module-relative by `module_relative` flag --- Lib/test/test_enum.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index fb7a016c9007f8..466fbbfdc44aed 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -2,7 +2,6 @@ import enum import doctest import inspect -import os import pydoc import sys import unittest @@ -26,11 +25,11 @@ def load_tests(loader, tests, ignore): tests.addTests(doctest.DocTestSuite(enum)) - if os.path.exists('Doc/library/enum.rst'): - tests.addTests(doctest.DocFileSuite( - '../../Doc/library/enum.rst', - optionflags=doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE, - )) + tests.addTests(doctest.DocFileSuite( + '../../Doc/library/enum.rst', + optionflags=doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE, + module_relative=True + )) return tests MODULE = __name__ From 19105db63a33c230de282da6d5e1b56aac910907 Mon Sep 17 00:00:00 2001 From: Radislav Chugunov Date: Sat, 6 May 2023 19:20:33 +0300 Subject: [PATCH 2/3] reverted deletion of doc file existence check, removed 'module_relative' flag --- Lib/test/test_enum.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 466fbbfdc44aed..85b2b5ca0bfcbc 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -2,6 +2,7 @@ import enum import doctest import inspect +import os import pydoc import sys import unittest @@ -25,11 +26,11 @@ def load_tests(loader, tests, ignore): tests.addTests(doctest.DocTestSuite(enum)) - tests.addTests(doctest.DocFileSuite( - '../../Doc/library/enum.rst', - optionflags=doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE, - module_relative=True - )) + if os.path.exists('../../Doc/library/enum.rst'): + tests.addTests(doctest.DocFileSuite( + '../../Doc/library/enum.rst', + optionflags=doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE, + )) return tests MODULE = __name__ From 7f0a199f78dd35c6f7bb82fc5d7c5a82ff40d744 Mon Sep 17 00:00:00 2001 From: Radislav Chugunov Date: Sat, 6 May 2023 19:31:09 +0300 Subject: [PATCH 3/3] search docs relatively to test file --- Lib/test/test_enum.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 85b2b5ca0bfcbc..b5d75da7e5777f 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -26,10 +26,11 @@ def load_tests(loader, tests, ignore): tests.addTests(doctest.DocTestSuite(enum)) - if os.path.exists('../../Doc/library/enum.rst'): + if os.path.exists(f"{os.path.dirname(__file__)}/../../Doc/library/enum.rst"): tests.addTests(doctest.DocFileSuite( '../../Doc/library/enum.rst', optionflags=doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE, + module_relative=True )) return tests