From c92fb202560a58e6d7fd5341c454cb8721ab9d67 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Tue, 26 Jan 2021 08:39:23 -0800 Subject: [PATCH 1/2] [Enum] only include .rst test if file available In order to ensure the ReST documentation is up to date for Enum, use doctest to check it -- but only if the .rst files have not been stripped. --- Lib/test/test_enum.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index daca2e3c83f2711..93a5dece1e1c3bb 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -1,6 +1,7 @@ import enum import doctest import inspect +import os import pydoc import sys import unittest @@ -15,13 +16,14 @@ from test.support import threading_helper from datetime import timedelta -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, - )) - return tests +if os.path.exists('../../Doc/library/enum.rst'): + 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, + )) + return tests # for pickle tests try: From 970a5b2b245b2852013227b2ca8e67895f3af460 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Tue, 26 Jan 2021 12:32:10 -0800 Subject: [PATCH 2/2] run ``__doc__`` tests --- Lib/test/test_enum.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 93a5dece1e1c3bb..96de878faf72d41 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -16,14 +16,14 @@ from test.support import threading_helper from datetime import timedelta -if os.path.exists('../../Doc/library/enum.rst'): - def load_tests(loader, tests, ignore): - tests.addTests(doctest.DocTestSuite(enum)) +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, )) - return tests + return tests # for pickle tests try: