Skip to content

Commit

Permalink
gh-118351: Adapt support.TEST_MODULES_ENABLED for builds without the …
Browse files Browse the repository at this point in the history
…config variable (GH-118354)
  • Loading branch information
Eclips4 authored Apr 29, 2024
1 parent 44f57a9 commit 51c70de
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Lib/test/support/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1181,8 +1181,9 @@ def requires_limited_api(test):
return test


TEST_MODULES_ENABLED = sysconfig.get_config_var('TEST_MODULES') == 'yes'

# Windows build doesn't support --disable-test-modules feature, so there's no
# 'TEST_MODULES' var in config
TEST_MODULES_ENABLED = (sysconfig.get_config_var('TEST_MODULES') or 'yes') == 'yes'

def requires_specialization(test):
return unittest.skipUnless(
Expand Down
6 changes: 4 additions & 2 deletions Lib/test/test_capi/test_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import unittest
from collections import UserDict
from test.support import import_helper
from test.support.os_helper import unlink, TESTFN, TESTFN_UNDECODABLE
from test.support.os_helper import unlink, TESTFN, TESTFN_ASCII, TESTFN_UNDECODABLE

NULL = None
_testcapi = import_helper.import_module('_testcapi')
Expand Down Expand Up @@ -35,6 +35,7 @@ class CAPITest(unittest.TestCase):

def test_run_stringflags(self):
# Test PyRun_StringFlags().
# XXX: fopen() uses different path encoding than Python on Windows.
def run(s, *args):
return _testcapi.run_stringflags(s, Py_file_input, *args)
source = b'a\n'
Expand Down Expand Up @@ -63,7 +64,7 @@ def run(s, *args):

def test_run_fileexflags(self):
# Test PyRun_FileExFlags().
filename = os.fsencode(TESTFN)
filename = os.fsencode(TESTFN if os.name != 'nt' else TESTFN_ASCII)
with open(filename, 'wb') as fp:
fp.write(b'a\n')
self.addCleanup(unlink, filename)
Expand All @@ -89,6 +90,7 @@ def run(*args):
# CRASHES run(UserDict(), dict(a=1))

@unittest.skipUnless(TESTFN_UNDECODABLE, 'only works if there are undecodable paths')
@unittest.skipIf(os.name == 'nt', 'does not work on Windows')
def test_run_fileexflags_with_undecodable_filename(self):
run = _testcapi.run_fileexflags
try:
Expand Down

0 comments on commit 51c70de

Please sign in to comment.