Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions Lib/test/test_os/test_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -1867,7 +1867,9 @@ def test_walk_bad_dir2(self):

walk_it = self.walk(self.tmp1_path, follow_symlinks=True)
if self.is_fwalk:
self.assertRaises(NotADirectoryError, next, walk_it)
with self.assertRaises(OSError) as cm:
next(walk_it)
self.assertIn(cm.exception.errno, (errno.ENOTDIR, errno.EINVAL))
self.assertRaises(StopIteration, next, walk_it)

@unittest.skipUnless(hasattr(os, "mkfifo"), 'requires os.mkfifo()')
Expand Down Expand Up @@ -2269,6 +2271,8 @@ def test_chown_with_root(self):

@requires_non_root_user
@unittest.skipUnless(len(all_users) > 1, "test needs and more than one user")
@unittest.skipIf(sys.platform == 'cygwin',
'chown() can set any uid on Cygwin')
def test_chown_without_permission(self):
uid_1, uid_2 = all_users[:2]
gid = os.stat(os_helper.TESTFN).st_gid
Expand Down Expand Up @@ -4051,10 +4055,11 @@ def test_timerfd_non_blocking(self):
initial_expiration = 0.1
os.timerfd_settime(fd, initial=initial_expiration, interval=0)

# read() raises OSError with errno is EAGAIN for non-blocking timer.
with self.assertRaises(OSError) as ctx:
self.read_count_signaled(fd)
self.assertEqual(ctx.exception.errno, errno.EAGAIN)
if sys.platform != 'cygwin':
# read() raises OSError with errno is EAGAIN for non-blocking timer.
with self.assertRaises(OSError) as ctx:
self.read_count_signaled(fd)
self.assertEqual(ctx.exception.errno, errno.EAGAIN)

# Wait more than 0.1 seconds
time.sleep(initial_expiration + 0.1)
Expand Down Expand Up @@ -4235,12 +4240,19 @@ def test_timerfd_ns_initval(self):

# 2nd call
next_expiration_ns, interval_ns2 = os.timerfd_settime_ns(fd, initial=initial_expiration_ns, interval=interval_ns)
self.assertEqual(interval_ns2, interval_ns)
CYGWIN = (sys.platform == 'cygwin')
if not CYGWIN:
self.assertEqual(interval_ns2, interval_ns)
else:
self.assertEqual(interval_ns2, 0)
self.assertEqual(next_expiration_ns, initial_expiration_ns)

# timerfd_gettime
next_expiration_ns, interval_ns2 = os.timerfd_gettime_ns(fd)
self.assertEqual(interval_ns2, interval_ns)
if not CYGWIN:
self.assertEqual(interval_ns2, interval_ns)
else:
self.assertEqual(interval_ns2, 0)
self.assertLessEqual(next_expiration_ns, initial_expiration_ns)

self.assertAlmostEqual(next_expiration_ns, initial_expiration_ns, delta=limit_error)
Expand Down
16 changes: 13 additions & 3 deletions Lib/test/test_os/test_posix.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ def test_initgroups(self):
self.assertRaises(TypeError, posix.initgroups, "foo", 3, object())

# If a non-privileged user invokes it, it should fail with OSError
# EPERM.
if os.getuid() != 0:
# EPERM. On Cygwin, initgroups(name, 13) does not fail.
if os.getuid() != 0 and sys.platform != 'cygwin':
try:
name = pwd.getpwuid(posix.getuid()).pw_name
except KeyError:
Expand Down Expand Up @@ -597,7 +597,9 @@ def test_sysconf(self):
posix.sysconf(1.23)

arg_max = posix.sysconf("SC_ARG_MAX")
self.assertGreater(arg_max, 0)
# SC_ARG_MAX is -1 on Cygwin
if sys.platform != 'cygwin':
self.assertGreater(arg_max, 0)
self.assertEqual(
posix.sysconf(posix.sysconf_names["SC_ARG_MAX"]), arg_max)

Expand Down Expand Up @@ -1943,6 +1945,14 @@ def test_no_such_executable(self):
# directories in the $PATH that are not accessible.
except (FileNotFoundError, PermissionError) as exc:
self.assertEqual(exc.filename, no_such_executable)

# On Cygwin, os.posix_spawn() creates a child process even if the
# executable doesn't exist. We have to reap this process.
if sys.platform == 'cygwin':
for _ in support.sleeping_retry(support.SHORT_TIMEOUT):
pid, status = os.waitpid(-1, os.WNOHANG)
if pid != 0:
break
else:
pid2, status = os.waitpid(pid, 0)
self.assertEqual(pid2, pid)
Expand Down
Loading