Skip to content

Commit 3cf9e10

Browse files
committed
Simplify test code
1 parent 9e61dde commit 3cf9e10

File tree

1 file changed

+17
-27
lines changed

1 file changed

+17
-27
lines changed

src/libproc/proc_pid.rs

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -725,34 +725,24 @@ fn pidfdinfo_test() {
725725

726726
let _listener = TcpListener::bind("127.0.0.1:65535");
727727

728-
match pidinfo::<BSDInfo>(pid, 0) {
729-
Ok(info) => {
730-
match listpidinfo::<ListFDs>(pid, info.pbi_nfiles as usize) {
731-
Ok(fds) => {
732-
for fd in fds {
733-
match fd.proc_fdtype.into() {
734-
ProcFDType::Socket => {
735-
if let Ok(socket) = pidfdinfo::<SocketFDInfo>(pid, fd.proc_fd) {
736-
match socket.psi.soi_kind.into() {
737-
SocketInfoKind::Tcp => unsafe {
738-
let info = socket.psi.soi_proto.pri_tcp;
739-
assert_eq!(socket.psi.soi_protocol,
740-
libc::IPPROTO_TCP);
741-
assert_eq!(info.tcpsi_ini.insi_lport as u32, 65535);
742-
}
743-
_ => (),
744-
}
745-
}
746-
},
747-
_ => (),
748-
}
728+
let info = pidinfo::<BSDInfo>(pid, 0).unwrap();
729+
let fds = listpidinfo::<ListFDs>(pid, info.pbi_nfiles as usize).unwrap();
730+
for fd in fds {
731+
match fd.proc_fdtype.into() {
732+
ProcFDType::Socket => {
733+
let socket = pidfdinfo::<SocketFDInfo>(pid, fd.proc_fd).unwrap();
734+
match socket.psi.soi_kind.into() {
735+
SocketInfoKind::Tcp => unsafe {
736+
let info = socket.psi.soi_proto.pri_tcp;
737+
assert_eq!(socket.psi.soi_protocol, libc::IPPROTO_TCP);
738+
assert_eq!(info.tcpsi_ini.insi_lport as u32, 65535);
749739
}
750-
},
751-
Err(err) => assert!(false, "Error retrieving process info: {}", err)
752-
}
753-
},
754-
Err(err) => assert!(false, "Error retrieving process info: {}", err)
755-
};
740+
_ => (),
741+
}
742+
},
743+
_ => (),
744+
}
745+
}
756746
}
757747

758748
#[repr(C)]

0 commit comments

Comments
 (0)