From 7a0a718aabc0b49f4dbb979ee2e24bc7cea18770 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 23 Aug 2023 23:53:18 +0200 Subject: [PATCH] test_peg_generator and test_freeze require cpu The test_peg_generator and test_tools.test_freeze tests now require the 'cpu' resource. Skip these tests unless the 'cpu' resource is enabled (it is disabled by default). These tests are no longer skipped if Python is built with ASAN or MSAN sanitizer. --- Lib/test/test_peg_generator/__init__.py | 6 ++---- Lib/test/test_tools/__init__.py | 6 ------ Lib/test/test_tools/test_freeze.py | 3 +++ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_peg_generator/__init__.py b/Lib/test/test_peg_generator/__init__.py index 87281eb5e03c7f..c23542e254c99f 100644 --- a/Lib/test/test_peg_generator/__init__.py +++ b/Lib/test/test_peg_generator/__init__.py @@ -4,10 +4,8 @@ from test.support import load_package_tests -if support.check_sanitizer(address=True, memory=True): - # gh-90791: Skip the test because it is too slow when Python is built - # with ASAN/MSAN: between 5 and 20 minutes on GitHub Actions. - raise unittest.SkipTest("test too slow on ASAN/MSAN build") +# Creating a virtual environment and building C extensions is slow +support.requires('cpu') # Load all tests in package diff --git a/Lib/test/test_tools/__init__.py b/Lib/test/test_tools/__init__.py index dde5d84e9edc6b..c4395c7c0ad0c9 100644 --- a/Lib/test/test_tools/__init__.py +++ b/Lib/test/test_tools/__init__.py @@ -7,12 +7,6 @@ from test.support import import_helper -if support.check_sanitizer(address=True, memory=True): - # gh-90791: Skip the test because it is too slow when Python is built - # with ASAN/MSAN: between 5 and 20 minutes on GitHub Actions. - raise unittest.SkipTest("test too slow on ASAN/MSAN build") - - if not support.has_subprocess_support: raise unittest.SkipTest("test module requires subprocess") diff --git a/Lib/test/test_tools/test_freeze.py b/Lib/test/test_tools/test_freeze.py index 2ba36ca208f967..3e9a48b5bc6a89 100644 --- a/Lib/test/test_tools/test_freeze.py +++ b/Lib/test/test_tools/test_freeze.py @@ -18,6 +18,9 @@ class TestFreeze(unittest.TestCase): def test_freeze_simple_script(self): + # Building Python is slow + support.requires('cpu') + script = textwrap.dedent(""" import sys print('running...')