From ca104cc3407b029afdb1b9f42f9096a6a1c7905a Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 18 Nov 2024 09:02:45 +0800 Subject: [PATCH 1/3] Correct sysconfig test exclusions for iOS and Android. --- Lib/test/test_sysconfig.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index c7acfe728bb664..dbb1b03aea15d9 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -591,7 +591,7 @@ def test_osx_ext_suffix(self): suffix = sysconfig.get_config_var('EXT_SUFFIX') self.assertTrue(suffix.endswith('-darwin.so'), suffix) - @unittest.skipIf(sys.platform == 'wasi', 'venv is unsupported on WASI') + @requires_subprocess def test_config_vars_depend_on_site_initialization(self): script = textwrap.dedent(""" import sysconfig @@ -615,7 +615,7 @@ def test_config_vars_depend_on_site_initialization(self): self.assertEqual(no_site_config_vars['base'], site_config_vars['installed_base']) self.assertEqual(no_site_config_vars['platbase'], site_config_vars['installed_platbase']) - @unittest.skipIf(sys.platform == 'wasi', 'venv is unsupported on WASI') + @requires_subprocess def test_config_vars_recalculation_after_site_initialization(self): script = textwrap.dedent(""" import sysconfig @@ -639,7 +639,7 @@ def test_config_vars_recalculation_after_site_initialization(self): #self.assertEqual(config_vars['after']['prefix'], venv.prefix) # FIXME: prefix gets overwriten by _init_posix #self.assertEqual(config_vars['after']['exec_prefix'], venv.prefix) # FIXME: exec_prefix gets overwriten by _init_posix - @unittest.skipIf(sys.platform == 'wasi', 'venv is unsupported on WASI') + @requires_subprocess def test_paths_depend_on_site_initialization(self): script = textwrap.dedent(""" import sysconfig @@ -656,7 +656,7 @@ def test_paths_depend_on_site_initialization(self): self.assertNotEqual(site_paths, no_site_paths) - @unittest.skipIf(sys.platform == 'wasi', 'venv is unsupported on WASI') + @unittest.skipIf(is_wasi, 'venv is unsupported on WASI') def test_makefile_overwrites_config_vars(self): script = textwrap.dedent(""" import sys, sysconfig From d77c7084da5fa73b0f0209664114d0c4cfab2b26 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 18 Nov 2024 09:22:26 +0800 Subject: [PATCH 2/3] Added missing braces from requires call. --- Lib/test/test_sysconfig.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index dbb1b03aea15d9..8f5a5ad43af28a 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -591,7 +591,7 @@ def test_osx_ext_suffix(self): suffix = sysconfig.get_config_var('EXT_SUFFIX') self.assertTrue(suffix.endswith('-darwin.so'), suffix) - @requires_subprocess + @requires_subprocess() def test_config_vars_depend_on_site_initialization(self): script = textwrap.dedent(""" import sysconfig @@ -615,7 +615,7 @@ def test_config_vars_depend_on_site_initialization(self): self.assertEqual(no_site_config_vars['base'], site_config_vars['installed_base']) self.assertEqual(no_site_config_vars['platbase'], site_config_vars['installed_platbase']) - @requires_subprocess + @requires_subprocess() def test_config_vars_recalculation_after_site_initialization(self): script = textwrap.dedent(""" import sysconfig @@ -639,7 +639,7 @@ def test_config_vars_recalculation_after_site_initialization(self): #self.assertEqual(config_vars['after']['prefix'], venv.prefix) # FIXME: prefix gets overwriten by _init_posix #self.assertEqual(config_vars['after']['exec_prefix'], venv.prefix) # FIXME: exec_prefix gets overwriten by _init_posix - @requires_subprocess + @requires_subprocess() def test_paths_depend_on_site_initialization(self): script = textwrap.dedent(""" import sysconfig From a70f3e9a2cc3a571c5a4ce02d0a8e726e7693632 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 18 Nov 2024 13:05:04 +0800 Subject: [PATCH 3/3] Skip another test that needs subprocesses. --- Lib/test/test_sysconfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 8f5a5ad43af28a..9bbf8d0c6cf2da 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -656,7 +656,7 @@ def test_paths_depend_on_site_initialization(self): self.assertNotEqual(site_paths, no_site_paths) - @unittest.skipIf(is_wasi, 'venv is unsupported on WASI') + @requires_subprocess() def test_makefile_overwrites_config_vars(self): script = textwrap.dedent(""" import sys, sysconfig @@ -689,6 +689,7 @@ def test_makefile_overwrites_config_vars(self): self.assertNotEqual(data['prefix'], data['base_prefix']) self.assertNotEqual(data['exec_prefix'], data['base_exec_prefix']) + class MakefileTests(unittest.TestCase): @unittest.skipIf(sys.platform.startswith('win'),