diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-04-03 13:32:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 13:32:55 (GMT) |
| commit | fad48ea1816be3125ea51edcdfe2f999d6ade796 (patch) | |
| tree | 57535b515bb3e47b738d76aa90c2b93ac50f3456 | |
| parent | 06ba6c86d2f05182b6d54f26ce80e40ea97c2d19 (diff) | |
| download | cpython-fad48ea1816be3125ea51edcdfe2f999d6ade796.zip cpython-fad48ea1816be3125ea51edcdfe2f999d6ade796.tar.gz cpython-fad48ea1816be3125ea51edcdfe2f999d6ade796.tar.bz2 | |
[3.12] gh-117166: Ignore empty and temporary dirs in `test_makefile` (GH-117190) (GH-117367)
gh-117166: Ignore empty and temporary dirs in `test_makefile` (GH-117190)
(cherry picked from commit d9cfe7e565a6e2dc15747a904736264e31a10be4)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
| -rw-r--r-- | Lib/test/test_tools/test_makefile.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_tools/test_makefile.py b/Lib/test/test_tools/test_makefile.py index 7222a05..17a1a6d 100644 --- a/Lib/test/test_tools/test_makefile.py +++ b/Lib/test/test_tools/test_makefile.py @@ -41,9 +41,17 @@ class TestMakefile(unittest.TestCase): self.assertIn(idle_test, test_dirs) used = [idle_test] - for dirpath, _, _ in os.walk(support.TEST_HOME_DIR): + for dirpath, dirs, files in os.walk(support.TEST_HOME_DIR): dirname = os.path.basename(dirpath) - if dirname == '__pycache__': + # Skip temporary dirs: + if dirname == '__pycache__' or dirname.startswith('.'): + dirs.clear() # do not process subfolders + continue + # Skip empty dirs: + if not dirs and not files: + continue + # Skip dirs with hidden-only files: + if files and all(filename.startswith('.') for filename in files): continue relpath = os.path.relpath(dirpath, support.STDLIB_DIR) |