mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-12-04 19:18:29 +01:00
Code Issues

Revert "restore some of the changes"

Browse Source 
This reverts commit cda20edef8c776a77fa321975a07eb9f27538fc7.
This commit is contained in:
yihuaf 2021-09-06 09:01:50 +02:00
parent abcd6ae6d5
commit eb6b4f412c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/process/channel.rs
View File

@ -244,12 +244,12 @@ mod tests {
let (sender, receiver) = &mut intermediate_to_main()?;
match unsafe { unistd::fork()? } {
unistd::ForkResult::Parent { child } => {
wait::waitpid(child, None)?;
let pid = receiver
.wait_for_intermediate_ready()
.with_context(|| "Failed to wait for intermadiate ready")?;
receiver.close()?;
assert_eq!(pid, child);
wait::waitpid(child, None)?;
}
unistd::ForkResult::Child => {
let pid = unistd::getpid();
@ -268,9 +268,9 @@ mod tests {
let (sender, receiver) = &mut intermediate_to_main()?;
match unsafe { unistd::fork()? } {
unistd::ForkResult::Parent { child } => {
wait::waitpid(child, None)?;
receiver.wait_for_mapping_request()?;
receiver.close()?;
wait::waitpid(child, None)?;
}
unistd::ForkResult::Child => {
sender
@ -290,8 +290,8 @@ mod tests {
let (sender, receiver) = &mut main_to_intermediate()?;
match unsafe { unistd::fork()? } {
unistd::ForkResult::Parent { child } => {
receiver.wait_for_mapping_ack()?;
wait::waitpid(child, None)?;
receiver.wait_for_mapping_ack()?;
}
unistd::ForkResult::Child => {
sender
@ -310,9 +310,9 @@ mod tests {
let (sender, receiver) = &mut init_to_intermediate()?;
match unsafe { unistd::fork()? } {
unistd::ForkResult::Parent { child } => {
wait::waitpid(child, None)?;
receiver.wait_for_init_ready()?;
receiver.close()?;
wait::waitpid(child, None)?;
}
unistd::ForkResult::Child => {
sender