summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Lib/test/libregrtest/setup.py4
-rw-r--r--Lib/test/libregrtest/utils.py11
-rw-r--r--Lib/test/test_fileio.py4
-rw-r--r--Lib/test/test_logging.py3
-rw-r--r--Lib/test/test_os.py44
-rw-r--r--Lib/test/test_pathlib/test_pathlib.py7
-rw-r--r--Lib/test/test_pydoc/test_pydoc.py1
-rw-r--r--Lib/test/test_strptime.py6
-rw-r--r--Lib/test/test_support.py1
-rw-r--r--Lib/test/test_tempfile.py10
-rw-r--r--Lib/test/test_time.py6
-rw-r--r--Lib/test/test_unicode_file_functions.py4
12 files changed, 19 insertions, 82 deletions
diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index ba57f06..c0346aa 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -11,7 +11,7 @@ from test.support.os_helper import TESTFN_UNDECODABLE, FS_NONASCII
from .filter import set_match_tests
from .runtests import RunTests
from .utils import (
- setup_unraisable_hook, setup_threading_excepthook, fix_umask,
+ setup_unraisable_hook, setup_threading_excepthook,
adjust_rlimit_nofile)
@@ -26,8 +26,6 @@ def setup_test_dir(testdir: str | None) -> None:
def setup_process() -> None:
- fix_umask()
-
assert sys.__stderr__ is not None, "sys.__stderr__ is None"
try:
stderr_fd = sys.__stderr__.fileno()
diff --git a/Lib/test/libregrtest/utils.py b/Lib/test/libregrtest/utils.py
index 1ecfc61..3eff9e7 100644
--- a/Lib/test/libregrtest/utils.py
+++ b/Lib/test/libregrtest/utils.py
@@ -478,17 +478,6 @@ def get_temp_dir(tmp_dir: StrPath | None = None) -> StrPath:
return os.path.abspath(tmp_dir)
-def fix_umask() -> None:
- if support.is_emscripten:
- # Emscripten has default umask 0o777, which breaks some tests.
- # see https://github.com/emscripten-core/emscripten/issues/17269
- old_mask = os.umask(0)
- if old_mask == 0o777:
- os.umask(0o027)
- else:
- os.umask(old_mask)
-
-
def get_work_dir(parent_dir: StrPath, worker: bool = False) -> StrPath:
# Define a writable temp dir that will be used as cwd while running
# the tests. The name of the dir includes the pid to allow parallel
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index e681417..5a0f033 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -10,7 +10,7 @@ from weakref import proxy
from functools import wraps
from test.support import (
- cpython_only, swap_attr, gc_collect, is_emscripten, is_wasi,
+ cpython_only, swap_attr, gc_collect, is_wasi,
infinite_recursion, strace_helper
)
from test.support.os_helper import (
@@ -531,7 +531,7 @@ class OtherFileTests:
self.assertEqual(f.isatty(), False)
f.close()
- if sys.platform != "win32" and not is_emscripten:
+ if sys.platform != "win32":
try:
f = self.FileIO("/dev/tty", "a")
except OSError:
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index e72f222..671b4c5 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -680,9 +680,6 @@ class HandlerTest(BaseTest):
os.unlink(fn)
@unittest.skipIf(os.name == 'nt', 'WatchedFileHandler not appropriate for Windows.')
- @unittest.skipIf(
- support.is_emscripten, "Emscripten cannot fstat unlinked files."
- )
@threading_helper.requires_working_threading()
@support.requires_resource('walltime')
def test_race(self):
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 8aac929..b0e686c 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -189,9 +189,6 @@ class FileTests(unittest.TestCase):
self.assertTrue(os.access(os_helper.TESTFN, os.W_OK))
@unittest.skipIf(
- support.is_emscripten, "Test is unstable under Emscripten."
- )
- @unittest.skipIf(
support.is_wasi, "WASI does not support dup."
)
def test_closerange(self):
@@ -1428,9 +1425,7 @@ class WalkTests(unittest.TestCase):
else:
self.sub2_tree = (sub2_path, ["SUB21"], ["tmp3"])
- if not support.is_emscripten:
- # Emscripten fails with inaccessible directory
- os.chmod(sub21_path, 0)
+ os.chmod(sub21_path, 0)
try:
os.listdir(sub21_path)
except PermissionError:
@@ -1727,9 +1722,6 @@ class FwalkTests(WalkTests):
self.assertEqual(set(os.listdir(rootfd)), set(dirs) | set(files))
@unittest.skipIf(
- support.is_emscripten, "Cannot dup stdout on Emscripten"
- )
- @unittest.skipIf(
support.is_android, "dup return value is unpredictable on Android"
)
def test_fd_leak(self):
@@ -1746,9 +1738,6 @@ class FwalkTests(WalkTests):
self.assertEqual(newfd, minfd)
@unittest.skipIf(
- support.is_emscripten, "Cannot dup stdout on Emscripten"
- )
- @unittest.skipIf(
support.is_android, "dup return value is unpredictable on Android"
)
def test_fd_finalization(self):
@@ -1816,8 +1805,8 @@ class MakedirTests(unittest.TestCase):
os.makedirs(path)
@unittest.skipIf(
- support.is_emscripten or support.is_wasi,
- "Emscripten's/WASI's umask is a stub."
+ support.is_wasi,
+ "WASI's umask is a stub."
)
def test_mode(self):
with os_helper.temp_umask(0o002):
@@ -1832,8 +1821,8 @@ class MakedirTests(unittest.TestCase):
self.assertEqual(os.stat(parent).st_mode & 0o777, 0o775)
@unittest.skipIf(
- support.is_emscripten or support.is_wasi,
- "Emscripten's/WASI's umask is a stub."
+ support.is_wasi,
+ "WASI's umask is a stub."
)
def test_exist_ok_existing_directory(self):
path = os.path.join(os_helper.TESTFN, 'dir1')
@@ -1850,8 +1839,8 @@ class MakedirTests(unittest.TestCase):
os.makedirs(os.path.abspath('/'), exist_ok=True)
@unittest.skipIf(
- support.is_emscripten or support.is_wasi,
- "Emscripten's/WASI's umask is a stub."
+ support.is_wasi,
+ "WASI's umask is a stub."
)
def test_exist_ok_s_isgid_directory(self):
path = os.path.join(os_helper.TESTFN, 'dir1')
@@ -2429,10 +2418,6 @@ class TestInvalidFD(unittest.TestCase):
self.check(os.dup2, 20)
@unittest.skipUnless(hasattr(os, 'dup2'), 'test needs os.dup2()')
- @unittest.skipIf(
- support.is_emscripten,
- "dup2() with negative fds is broken on Emscripten (see gh-102179)"
- )
def test_dup2_negative_fd(self):
valid_fd = os.open(__file__, os.O_RDONLY)
self.addCleanup(os.close, valid_fd)
@@ -2457,14 +2442,14 @@ class TestInvalidFD(unittest.TestCase):
self.check(os.fchown, -1, -1)
@unittest.skipUnless(hasattr(os, 'fpathconf'), 'test needs os.fpathconf()')
- @unittest.skipIf(
- support.is_emscripten or support.is_wasi,
- "musl libc issue on Emscripten/WASI, bpo-46390"
- )
def test_fpathconf(self):
self.assertIn("PC_NAME_MAX", os.pathconf_names)
- self.check(os.pathconf, "PC_NAME_MAX")
- self.check(os.fpathconf, "PC_NAME_MAX")
+ if not (support.is_emscripten or support.is_wasi):
+ # musl libc pathconf ignores the file descriptor and always returns
+ # a constant, so the assertion that it should notice a bad file
+ # descriptor and return EBADF fails.
+ self.check(os.pathconf, "PC_NAME_MAX")
+ self.check(os.fpathconf, "PC_NAME_MAX")
self.check_bool(os.pathconf, "PC_NAME_MAX")
self.check_bool(os.fpathconf, "PC_NAME_MAX")
@@ -3395,9 +3380,6 @@ class DeviceEncodingTests(unittest.TestCase):
@unittest.skipUnless(os.isatty(0) and not win32_is_iot() and (sys.platform.startswith('win') or
(hasattr(locale, 'nl_langinfo') and hasattr(locale, 'CODESET'))),
'test requires a tty and either Windows or nl_langinfo(CODESET)')
- @unittest.skipIf(
- support.is_emscripten, "Cannot get encoding of stdin on Emscripten"
- )
def test_device_encoding(self):
encoding = os.device_encoding(0)
self.assertIsNotNone(encoding)
diff --git a/Lib/test/test_pathlib/test_pathlib.py b/Lib/test/test_pathlib/test_pathlib.py
index 68bff2c..ac3a3b4 100644
--- a/Lib/test/test_pathlib/test_pathlib.py
+++ b/Lib/test/test_pathlib/test_pathlib.py
@@ -1673,7 +1673,6 @@ class PathTest(test_pathlib_abc.DummyPathTest, PurePathTest):
self.assertTrue(p.exists())
self.assertEqual(p.stat().st_ctime, st_ctime_first)
- @unittest.skipIf(is_emscripten, "FS root cannot be modified on Emscripten.")
def test_mkdir_exist_ok_root(self):
# Issue #25803: A drive root could raise PermissionError on Windows.
self.cls('/').resolve().mkdir(exist_ok=True)
@@ -2039,7 +2038,6 @@ class PathTest(test_pathlib_abc.DummyPathTest, PurePathTest):
self.assertEqual(expect, set(p.rglob(FakePath(pattern))))
@needs_symlinks
- @unittest.skipIf(is_emscripten, "Hangs")
def test_glob_recurse_symlinks_common(self):
def _check(path, glob, expected):
actual = {path for path in path.glob(glob, recurse_symlinks=True)
@@ -2077,7 +2075,6 @@ class PathTest(test_pathlib_abc.DummyPathTest, PurePathTest):
_check(p, "*/dirD/**/", ["dirC/dirD/"])
@needs_symlinks
- @unittest.skipIf(is_emscripten, "Hangs")
def test_rglob_recurse_symlinks_common(self):
def _check(path, glob, expected):
actual = {path for path in path.rglob(glob, recurse_symlinks=True)
@@ -2484,9 +2481,7 @@ class PathWalkTest(test_pathlib_abc.DummyPathWalkTest):
os.symlink(tmp5_path, broken_link3_path)
self.sub2_tree[2].append('broken_link3')
self.sub2_tree[2].sort()
- if not is_emscripten:
- # Emscripten fails with inaccessible directories.
- os.chmod(sub21_path, 0)
+ os.chmod(sub21_path, 0)
try:
os.listdir(sub21_path)
except PermissionError:
diff --git a/Lib/test/test_pydoc/test_pydoc.py b/Lib/test/test_pydoc/test_pydoc.py
index 2a4d3ab..3283fde 100644
--- a/Lib/test/test_pydoc/test_pydoc.py
+++ b/Lib/test/test_pydoc/test_pydoc.py
@@ -1224,7 +1224,6 @@ class PydocImportTest(PydocBaseTest):
self.assertEqual(err.getvalue(), '')
@os_helper.skip_unless_working_chmod
- @unittest.skipIf(is_emscripten, "cannot remove x bit")
def test_apropos_empty_doc(self):
pkgdir = os.path.join(TESTFN, 'walkpkg')
os.mkdir(pkgdir)
diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
index 9f5cfca..0d30a63 100644
--- a/Lib/test/test_strptime.py
+++ b/Lib/test/test_strptime.py
@@ -79,9 +79,6 @@ class LocaleTime_Tests(unittest.TestCase):
self.assertEqual(self.LT_ins.am_pm[position], strftime_output,
"AM/PM representation in the wrong position within the tuple")
- @unittest.skipIf(
- support.is_emscripten, "musl libc issue on Emscripten, bpo-46390"
- )
def test_timezone(self):
# Make sure timezone is correct
timezone = time.strftime("%Z", self.time_tuple).lower()
@@ -431,9 +428,6 @@ class StrptimeTests(unittest.TestCase):
self.assertEqual("Inconsistent use of : in -01:3030", str(err.exception))
@skip_if_buggy_ucrt_strfptime
- @unittest.skipIf(
- support.is_emscripten, "musl libc issue on Emscripten, bpo-46390"
- )
def test_timezone(self):
# Test timezone directives.
# When gmtime() is used with %Z, entire result of strftime() is empty.
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 635ae03..d900db5 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -549,7 +549,6 @@ class TestSupport(unittest.TestCase):
self.check_options(opts, 'optim_args_from_interpreter_flags')
@unittest.skipIf(support.is_apple_mobile, "Unstable on Apple Mobile")
- @unittest.skipIf(support.is_emscripten, "Unstable in Emscripten")
@unittest.skipIf(support.is_wasi, "Unavailable on WASI")
def test_fd_count(self):
# We cannot test the absolute value of fd_count(): on old Linux kernel
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index a5e182c..57e9bd2 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -328,10 +328,6 @@ def _mock_candidate_names(*names):
class TestBadTempdir:
-
- @unittest.skipIf(
- support.is_emscripten, "Emscripten cannot remove write bits."
- )
def test_read_only_directory(self):
with _inside_empty_temp_dir():
oldmode = mode = os.stat(tempfile.tempdir).st_mode
@@ -1240,9 +1236,6 @@ class TestSpooledTemporaryFile(BaseTestCase):
with self.assertWarns(ResourceWarning):
f.__del__()
- @unittest.skipIf(
- support.is_emscripten, "Emscripten cannot fstat renamed files."
- )
def test_del_rolled_file(self):
# The rolled file should be deleted when the SpooledTemporaryFile
# object is deleted. This should raise a ResourceWarning since the file
@@ -1468,9 +1461,6 @@ class TestSpooledTemporaryFile(BaseTestCase):
pass
self.assertRaises(ValueError, use_closed)
- @unittest.skipIf(
- support.is_emscripten, "Emscripten cannot fstat renamed files."
- )
def test_truncate_with_size_parameter(self):
# A SpooledTemporaryFile can be truncated to zero size
f = tempfile.SpooledTemporaryFile(max_size=10)
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 9239830..1c540be 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -361,9 +361,6 @@ class TimeTestCase(unittest.TestCase):
def test_asctime_bounding_check(self):
self._bounds_checking(time.asctime)
- @unittest.skipIf(
- support.is_emscripten, "musl libc issue on Emscripten, bpo-46390"
- )
def test_ctime(self):
t = time.mktime((1973, 9, 16, 1, 3, 52, 0, 0, -1))
self.assertEqual(time.ctime(t), 'Sun Sep 16 01:03:52 1973')
@@ -746,9 +743,6 @@ class TestStrftime4dyear(_TestStrftimeYear, _Test4dYear, unittest.TestCase):
class TestPytime(unittest.TestCase):
@skip_if_buggy_ucrt_strfptime
@unittest.skipUnless(time._STRUCT_TM_ITEMS == 11, "needs tm_zone support")
- @unittest.skipIf(
- support.is_emscripten, "musl libc issue on Emscripten, bpo-46390"
- )
def test_localtime_timezone(self):
# Get the localtime and examine it for the offset and zone.
diff --git a/Lib/test/test_unicode_file_functions.py b/Lib/test/test_unicode_file_functions.py
index 25c16e3..4a067d7 100644
--- a/Lib/test/test_unicode_file_functions.py
+++ b/Lib/test/test_unicode_file_functions.py
@@ -125,8 +125,8 @@ class UnicodeFileTests(unittest.TestCase):
# open(), os.stat(), etc. don't raise any exception.
@unittest.skipIf(is_apple, 'irrelevant test on Apple platforms')
@unittest.skipIf(
- support.is_emscripten or support.is_wasi,
- "test fails on Emscripten/WASI when host platform is macOS."
+ support.is_wasi,
+ "test fails on WASI when host platform is macOS."
)
def test_normalize(self):
files = set(self.files)
generated by cgit v0.12 at 2025-02-05 02:58:19 (GMT)