Skip to content

Fix posix tests #5811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 22, 2025
Merged

Fix posix tests #5811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1909aeb
Fix PosixSpawnArgs
youknowone Jun 21, 2025
4078992
test_specify_environment
youknowone Jun 21, 2025
dde4302
fixupo
youknowone Jun 21, 2025
151598c
Apply reviews
youknowone Jun 22, 2025
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
14 changes: 0 additions & 14 deletions Lib/test/test_posix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,8 +1730,6 @@ def test_no_such_executable(self):
self.assertEqual(pid2, pid)
self.assertNotEqual(status, 0)

# TODO: RUSTPYTHON: TypeError: '_Environ' object is not a mapping
@unittest.expectedFailure
def test_specify_environment(self):
envfile = os_helper.TESTFN
self.addCleanup(os_helper.unlink, envfile)
Expand Down Expand Up @@ -1765,8 +1763,6 @@ def test_empty_file_actions(self):
)
support.wait_process(pid, exitcode=0)

# TODO: RUSTPYTHON: TypeError: Unexpected keyword argument resetids
@unittest.expectedFailure
def test_resetids_explicit_default(self):
pid = self.spawn_func(
sys.executable,
Expand All @@ -1776,8 +1772,6 @@ def test_resetids_explicit_default(self):
)
support.wait_process(pid, exitcode=0)

# TODO: RUSTPYTHON: TypeError: Unexpected keyword argument resetids
@unittest.expectedFailure
def test_resetids(self):
pid = self.spawn_func(
sys.executable,
Expand All @@ -1787,8 +1781,6 @@ def test_resetids(self):
)
support.wait_process(pid, exitcode=0)

# TODO: RUSTPYTHON: TypeError: Unexpected keyword argument setpgroup
@unittest.expectedFailure
def test_setpgroup(self):
pid = self.spawn_func(
sys.executable,
Expand Down Expand Up @@ -1819,8 +1811,6 @@ def test_setsigmask(self):
)
support.wait_process(pid, exitcode=0)

# TODO: RUSTPYTHON: TypeError: Unexpected keyword argument setsigmask
@unittest.expectedFailure
def test_setsigmask_wrong_type(self):
with self.assertRaises(TypeError):
self.spawn_func(sys.executable,
Expand All @@ -1836,8 +1826,6 @@ def test_setsigmask_wrong_type(self):
os.environ, setsigmask=[signal.NSIG,
signal.NSIG+1])

# TODO: RUSTPYTHON: TypeError: Unexpected keyword argument setsid
@unittest.expectedFailure
def test_setsid(self):
rfd, wfd = os.pipe()
self.addCleanup(os.close, rfd)
Expand Down Expand Up @@ -1902,7 +1890,6 @@ def test_setsigdef_wrong_type(self):
[sys.executable, "-c", "pass"],
os.environ, setsigdef=[signal.NSIG, signal.NSIG+1])

# TODO: RUSTPYTHON: TypeError: Unexpected keyword argument scheduler
@unittest.expectedFailure
@requires_sched
@unittest.skipIf(sys.platform.startswith(('freebsd', 'netbsd')),
Expand All @@ -1924,7 +1911,6 @@ def test_setscheduler_only_param(self):
)
support.wait_process(pid, exitcode=0)

# TODO: RUSTPYTHON: TypeError: Unexpected keyword argument scheduler
@unittest.expectedFailure
@requires_sched
@unittest.skipIf(sys.platform.startswith(('freebsd', 'netbsd')),
Expand Down
115 changes: 103 additions & 12 deletions vm/src/stdlib/posix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,20 +1308,33 @@ pub mod module {
env: crate::function::ArgMapping,
vm: &VirtualMachine,
) -> PyResult<Vec<CString>> {
let keys = env.mapping().keys(vm)?;
let values = env.mapping().values(vm)?;
let items = env.mapping().items(vm)?;

let keys = PyListRef::try_from_object(vm, keys)
.map_err(|_| vm.new_type_error("env.keys() is not a list".to_owned()))?
.borrow_vec()
.to_vec();
let values = PyListRef::try_from_object(vm, values)
.map_err(|_| vm.new_type_error("env.values() is not a list".to_owned()))?
.borrow_vec()
.to_vec();
// Convert items to list if it isn't already
let items = vm.ctx.new_list(
items
.get_iter(vm)?
.iter(vm)?
.collect::<PyResult<Vec<_>>>()?,
);

keys.into_iter()
.zip(values)
items
.borrow_vec()
.iter()
.map(|item| {
let tuple = item
.downcast_ref::<crate::builtins::PyTuple>()
.ok_or_else(|| vm.new_type_error("items() should return tuples".to_owned()))?;
let tuple_items = tuple.as_slice();
if tuple_items.len() != 2 {
return Err(vm.new_value_error(
"items() tuples should have exactly 2 elements".to_owned(),
));
}
Ok((tuple_items[0].clone(), tuple_items[1].clone()))
})
.collect::<PyResult<Vec<_>>>()?
.into_iter()
.map(|(k, v)| {
let k = OsPath::try_from_object(vm, k)?.into_bytes();
let v = OsPath::try_from_object(vm, v)?.into_bytes();
Expand Down Expand Up @@ -1361,6 +1374,16 @@ pub mod module {
file_actions: Option<crate::function::ArgIterable<PyTupleRef>>,
#[pyarg(named, default)]
setsigdef: Option<crate::function::ArgIterable<i32>>,
#[pyarg(named, default)]
setpgroup: Option<libc::pid_t>,
#[pyarg(named, default)]
resetids: bool,
#[pyarg(named, default)]
setsid: bool,
#[pyarg(named, default)]
setsigmask: Option<crate::function::ArgIterable<i32>>,
#[pyarg(named, default)]
scheduler: Option<PyTupleRef>,
}

#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))]
Expand Down Expand Up @@ -1459,6 +1482,74 @@ pub mod module {
);
}

// Handle new posix_spawn attributes
let mut flags = 0i32;

if let Some(pgid) = self.setpgroup {
let ret = unsafe { libc::posix_spawnattr_setpgroup(&mut attrp, pgid) };
if ret != 0 {
return Err(vm.new_os_error(format!("posix_spawnattr_setpgroup failed: {ret}")));
}
flags |= libc::POSIX_SPAWN_SETPGROUP;
}

if self.resetids {
flags |= libc::POSIX_SPAWN_RESETIDS;
}

if self.setsid {
// Note: POSIX_SPAWN_SETSID may not be available on all platforms
#[cfg(target_os = "linux")]
{
flags |= 0x0080; // POSIX_SPAWN_SETSID value on Linux
}
#[cfg(not(target_os = "linux"))]
{
return Err(vm.new_not_implemented_error(
"setsid parameter is not supported on this platform".to_owned(),
));
}
}

if let Some(sigs) = self.setsigmask {
use nix::sys::signal;
let mut set = signal::SigSet::empty();
for sig in sigs.iter(vm)? {
let sig = sig?;
let sig = signal::Signal::try_from(sig).map_err(|_| {
vm.new_value_error(format!("signal number {sig} out of range"))
})?;
set.add(sig);
}
let ret = unsafe { libc::posix_spawnattr_setsigmask(&mut attrp, set.as_ref()) };
if ret != 0 {
return Err(
vm.new_os_error(format!("posix_spawnattr_setsigmask failed: {ret}"))
);
}
flags |= libc::POSIX_SPAWN_SETSIGMASK;
}

if let Some(_scheduler) = self.scheduler {
// TODO: Implement scheduler parameter handling
// This requires platform-specific sched_param struct handling
return Err(vm.new_not_implemented_error(
"scheduler parameter is not yet implemented".to_owned(),
));
}

if flags != 0 {
// Check for potential overflow when casting to c_short
if flags > libc::c_short::MAX as i32 {
return Err(vm.new_value_error("Too many flags set for posix_spawn".to_owned()));
}
let ret =
unsafe { libc::posix_spawnattr_setflags(&mut attrp, flags as libc::c_short) };
if ret != 0 {
return Err(vm.new_os_error(format!("posix_spawnattr_setflags failed: {ret}")));
}
}

let mut args: Vec<CString> = self
.args
.iter(vm)?
Expand Down
Loading