summaryrefslogtreecommitdiff
path: root/test/sys
diff options
context:
space:
mode:
Diffstat (limited to 'test/sys')
-rw-r--r--test/sys/test_aio.rs14
-rw-r--r--test/sys/test_epoll.rs4
-rw-r--r--test/sys/test_socket.rs2
-rw-r--r--test/sys/test_termios.rs2
-rw-r--r--test/sys/test_uio.rs35
-rw-r--r--test/sys/test_wait.rs24
6 files changed, 33 insertions, 48 deletions
diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs
index b4ea6757..12749b1d 100644
--- a/test/sys/test_aio.rs
+++ b/test/sys/test_aio.rs
@@ -85,7 +85,7 @@ mod aio_fsync {
SigevNotify::SigevNone,
));
let err = aiof.as_mut().submit();
- assert!(err.is_err());
+ err.expect_err("assertion failed");
}
#[test]
@@ -102,7 +102,7 @@ mod aio_fsync {
SigevNotify::SigevNone,
));
let err = aiof.as_mut().submit();
- assert!(err.is_ok());
+ err.expect("assert failed");
poll_aio!(&mut aiof).unwrap();
aiof.as_mut().aio_return().unwrap();
}
@@ -149,7 +149,7 @@ mod aio_read {
aior.as_mut().submit().unwrap();
let cancelstat = aior.as_mut().cancel();
- assert!(cancelstat.is_ok());
+ cancelstat.expect("assert failed");
// Wait for aiow to complete, but don't care whether it succeeded
let _ = poll_aio!(&mut aior);
@@ -174,7 +174,7 @@ mod aio_read {
0, //priority
SigevNotify::SigevNone,
));
- assert!(aior.as_mut().submit().is_err());
+ aior.as_mut().submit().expect_err("assertion failed");
}
// Test a simple aio operation with no completion notification. We must
@@ -342,7 +342,7 @@ mod aio_write {
assert!(err == Ok(()) || err == Err(Errno::EINPROGRESS));
let cancelstat = aiow.as_mut().cancel();
- assert!(cancelstat.is_ok());
+ cancelstat.expect("assert failed");
// Wait for aiow to complete, but don't care whether it succeeded
let _ = poll_aio!(&mut aiow);
@@ -426,7 +426,7 @@ mod aio_write {
0, //priority
SigevNotify::SigevNone,
));
- assert!(aiow.as_mut().submit().is_err());
+ aiow.as_mut().submit().expect_err("assertion failed");
// Dropping the AioWrite at this point should not panic
}
}
@@ -565,7 +565,7 @@ fn test_aio_cancel_all() {
assert!(err == Ok(()) || err == Err(Errno::EINPROGRESS));
let cancelstat = aio_cancel_all(f.as_raw_fd());
- assert!(cancelstat.is_ok());
+ cancelstat.expect("assert failed");
// Wait for aiocb to complete, but don't care whether it succeeded
let _ = poll_aio!(&mut aiocb);
diff --git a/test/sys/test_epoll.rs b/test/sys/test_epoll.rs
index fafbd749..91569159 100644
--- a/test/sys/test_epoll.rs
+++ b/test/sys/test_epoll.rs
@@ -6,11 +6,11 @@ use nix::sys::epoll::{EpollCreateFlags, EpollEvent, EpollFlags, EpollOp};
pub fn test_epoll_errno() {
let efd = epoll_create1(EpollCreateFlags::empty()).unwrap();
let result = epoll_ctl(efd, EpollOp::EpollCtlDel, 1, None);
- assert!(result.is_err());
+ result.expect_err("assertion failed");
assert_eq!(result.unwrap_err(), Errno::ENOENT);
let result = epoll_ctl(efd, EpollOp::EpollCtlAdd, 1, None);
- assert!(result.is_err());
+ result.expect_err("assertion failed");
assert_eq!(result.unwrap_err(), Errno::EINVAL);
}
diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs
index 0a74b5e1..06d5b761 100644
--- a/test/sys/test_socket.rs
+++ b/test/sys/test_socket.rs
@@ -204,7 +204,7 @@ pub fn test_addr_equality_path() {
pub fn test_abstract_sun_path_too_long() {
let name = String::from("nix\0abstract\0tesnix\0abstract\0tesnix\0abstract\0tesnix\0abstract\0tesnix\0abstract\0testttttnix\0abstract\0test\0make\0sure\0this\0is\0long\0enough");
let addr = UnixAddr::new_abstract(name.as_bytes());
- assert!(addr.is_err());
+ addr.expect_err("assertion failed");
}
#[cfg(any(target_os = "android", target_os = "linux"))]
diff --git a/test/sys/test_termios.rs b/test/sys/test_termios.rs
index e567a52c..11a08cb5 100644
--- a/test/sys/test_termios.rs
+++ b/test/sys/test_termios.rs
@@ -22,7 +22,7 @@ fn test_tcgetattr_pty() {
let _m = crate::PTSNAME_MTX.lock();
let pty = openpty(None, None).expect("openpty failed");
- assert!(termios::tcgetattr(pty.slave).is_ok());
+ termios::tcgetattr(pty.slave).expect("assert failed");
close(pty.master).expect("closing the master failed");
close(pty.slave).expect("closing the slave failed");
}
diff --git a/test/sys/test_uio.rs b/test/sys/test_uio.rs
index f46b1940..0f4b8a65 100644
--- a/test/sys/test_uio.rs
+++ b/test/sys/test_uio.rs
@@ -41,29 +41,22 @@ fn test_writev() {
consumed += slice_len;
}
let pipe_res = pipe();
- assert!(pipe_res.is_ok());
- let (reader, writer) = pipe_res.ok().unwrap();
+ let (reader, writer) = pipe_res.expect("Couldn't create pipe");
// FileDesc will close its filedesc (reader).
let mut read_buf: Vec<u8> = iter::repeat(0u8).take(128 * 16).collect();
// Blocking io, should write all data.
let write_res = writev(writer, &iovecs);
- // Successful write
- assert!(write_res.is_ok());
- let written = write_res.ok().unwrap();
+ let written = write_res.expect("couldn't write");
// Check whether we written all data
assert_eq!(to_write.len(), written);
let read_res = read(reader, &mut read_buf[..]);
- // Successful read
- assert!(read_res.is_ok());
- let read = read_res.ok().unwrap() as usize;
+ let read = read_res.expect("couldn't read");
// Check we have read as much as we written
assert_eq!(read, written);
// Check equality of written and read data
assert_eq!(&to_write, &read_buf);
- let close_res = close(writer);
- assert!(close_res.is_ok());
- let close_res = close(reader);
- assert!(close_res.is_ok());
+ close(writer).expect("closed writer");
+ close(reader).expect("closed reader");
}
#[test]
@@ -92,16 +85,10 @@ fn test_readv() {
for v in &mut storage {
iovecs.push(IoSliceMut::new(&mut v[..]));
}
- let pipe_res = pipe();
- assert!(pipe_res.is_ok());
- let (reader, writer) = pipe_res.ok().unwrap();
+ let (reader, writer) = pipe().expect("couldn't create pipe");
// Blocking io, should write all data.
- let write_res = write(writer, &to_write);
- // Successful write
- assert!(write_res.is_ok());
- let read_res = readv(reader, &mut iovecs[..]);
- assert!(read_res.is_ok());
- let read = read_res.ok().unwrap();
+ write(writer, &to_write).expect("write failed");
+ let read = readv(reader, &mut iovecs[..]).expect("read failed");
// Check whether we've read all data
assert_eq!(to_write.len(), read);
// Cccumulate data from iovecs
@@ -113,10 +100,8 @@ fn test_readv() {
assert_eq!(read_buf.len(), to_write.len());
// Check equality of written and read data
assert_eq!(&read_buf, &to_write);
- let close_res = close(reader);
- assert!(close_res.is_ok());
- let close_res = close(writer);
- assert!(close_res.is_ok());
+ close(reader).expect("couldn't close reader");
+ close(writer).expect("couldn't close writer");
}
#[test]
diff --git a/test/sys/test_wait.rs b/test/sys/test_wait.rs
index 1a4a0f87..d472f1ec 100644
--- a/test/sys/test_wait.rs
+++ b/test/sys/test_wait.rs
@@ -167,17 +167,17 @@ mod ptrace {
Ok(WaitStatus::Stopped(child, SIGTRAP))
);
// We want to test a syscall stop and a PTRACE_EVENT stop
- assert!(ptrace::setoptions(
+ ptrace::setoptions(
child,
- Options::PTRACE_O_TRACESYSGOOD | Options::PTRACE_O_TRACEEXIT
+ Options::PTRACE_O_TRACESYSGOOD | Options::PTRACE_O_TRACEEXIT,
)
- .is_ok());
+ .expect("setoptions failed");
// First, stop on the next system call, which will be exit()
- assert!(ptrace::syscall(child, None).is_ok());
+ ptrace::syscall(child, None).expect("syscall failed");
assert_eq!(waitpid(child, None), Ok(WaitStatus::PtraceSyscall(child)));
// Then get the ptrace event for the process exiting
- assert!(ptrace::cont(child, None).is_ok());
+ ptrace::cont(child, None).expect("cont failed");
assert_eq!(
waitpid(child, None),
Ok(WaitStatus::PtraceEvent(
@@ -187,7 +187,7 @@ mod ptrace {
))
);
// Finally get the normal wait() result, now that the process has exited
- assert!(ptrace::cont(child, None).is_ok());
+ ptrace::cont(child, None).expect("cont failed");
assert_eq!(waitpid(child, None), Ok(WaitStatus::Exited(child, 0)));
}
@@ -202,20 +202,20 @@ mod ptrace {
Ok(WaitStatus::PtraceEvent(child, SIGTRAP, 0)),
);
// We want to test a syscall stop and a PTRACE_EVENT stop
- assert!(ptrace::setoptions(
+ ptrace::setoptions(
child,
- Options::PTRACE_O_TRACESYSGOOD | Options::PTRACE_O_TRACEEXIT
+ Options::PTRACE_O_TRACESYSGOOD | Options::PTRACE_O_TRACEEXIT,
)
- .is_ok());
+ .expect("setopts failed");
// First, stop on the next system call, which will be exit()
- assert!(ptrace::syscall(child, None).is_ok());
+ ptrace::syscall(child, None).expect("syscall failed");
assert_eq!(
waitid(Id::Pid(child), WaitPidFlag::WEXITED),
Ok(WaitStatus::PtraceSyscall(child)),
);
// Then get the ptrace event for the process exiting
- assert!(ptrace::cont(child, None).is_ok());
+ ptrace::cont(child, None).expect("cont failed");
assert_eq!(
waitid(Id::Pid(child), WaitPidFlag::WEXITED),
Ok(WaitStatus::PtraceEvent(
@@ -225,7 +225,7 @@ mod ptrace {
)),
);
// Finally get the normal wait() result, now that the process has exited
- assert!(ptrace::cont(child, None).is_ok());
+ ptrace::cont(child, None).expect("cont failed");
assert_eq!(
waitid(Id::Pid(child), WaitPidFlag::WEXITED),
Ok(WaitStatus::Exited(child, 0)),
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 08:44:30 +0000