From 384d47d25e39b3e2cdbc2a8c28ec68abb709de64 Mon Sep 17 00:00:00 2001
From: Michael Baikov <manpacket@gmail.com>
Date: Wed, 10 Aug 2022 08:55:45 +0800
Subject: Folloup for !1778, remove some of the less helpful error msgs

---
 test/sys/test_aio.rs     | 12 ++++--------
 test/sys/test_termios.rs |  2 +-
 test/test_time.rs        | 10 +++++-----
 3 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'test')

diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs
index 12749b1d..6a36f3e7 100644
--- a/test/sys/test_aio.rs
+++ b/test/sys/test_aio.rs
@@ -101,8 +101,7 @@ mod aio_fsync {
             0,
             SigevNotify::SigevNone,
         ));
-        let err = aiof.as_mut().submit();
-        err.expect("assert failed");
+        aiof.as_mut().submit().unwrap();
         poll_aio!(&mut aiof).unwrap();
         aiof.as_mut().aio_return().unwrap();
     }
@@ -148,8 +147,7 @@ mod aio_read {
             Box::pin(AioRead::new(fd, 2, &mut rbuf, 0, SigevNotify::SigevNone));
         aior.as_mut().submit().unwrap();
 
-        let cancelstat = aior.as_mut().cancel();
-        cancelstat.expect("assert failed");
+        aior.as_mut().cancel().unwrap();
 
         // Wait for aiow to complete, but don't care whether it succeeded
         let _ = poll_aio!(&mut aior);
@@ -341,8 +339,7 @@ mod aio_write {
         let err = aiow.as_mut().error();
         assert!(err == Ok(()) || err == Err(Errno::EINPROGRESS));
 
-        let cancelstat = aiow.as_mut().cancel();
-        cancelstat.expect("assert failed");
+        aiow.as_mut().cancel().unwrap();
 
         // Wait for aiow to complete, but don't care whether it succeeded
         let _ = poll_aio!(&mut aiow);
@@ -564,8 +561,7 @@ fn test_aio_cancel_all() {
     let err = aiocb.as_mut().error();
     assert!(err == Ok(()) || err == Err(Errno::EINPROGRESS));
 
-    let cancelstat = aio_cancel_all(f.as_raw_fd());
-    cancelstat.expect("assert failed");
+    aio_cancel_all(f.as_raw_fd()).unwrap();
 
     // Wait for aiocb to complete, but don't care whether it succeeded
     let _ = poll_aio!(&mut aiocb);
diff --git a/test/sys/test_termios.rs b/test/sys/test_termios.rs
index 11a08cb5..aaf00084 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");
-    termios::tcgetattr(pty.slave).expect("assert failed");
+    termios::tcgetattr(pty.slave).unwrap();
     close(pty.master).expect("closing the master failed");
     close(pty.slave).expect("closing the slave failed");
 }
diff --git a/test/test_time.rs b/test/test_time.rs
index 3e8af653..5f76e61a 100644
--- a/test/test_time.rs
+++ b/test/test_time.rs
@@ -29,18 +29,18 @@ pub fn test_clock_gettime() {
 #[test]
 pub fn test_clock_getcpuclockid() {
     let clock_id = clock_getcpuclockid(nix::unistd::Pid::this()).unwrap();
-    clock_gettime(clock_id).expect("assert failed");
+    clock_gettime(clock_id).unwrap();
 }
 
 #[cfg(not(target_os = "redox"))]
 #[test]
 pub fn test_clock_id_res() {
-    ClockId::CLOCK_REALTIME.res().expect("assert failed");
+    ClockId::CLOCK_REALTIME.res().unwrap();
 }
 
 #[test]
 pub fn test_clock_id_now() {
-    ClockId::CLOCK_REALTIME.now().expect("assert failed");
+    ClockId::CLOCK_REALTIME.now().unwrap();
 }
 
 #[cfg(any(
@@ -54,6 +54,6 @@ pub fn test_clock_id_now() {
 pub fn test_clock_id_pid_cpu_clock_id() {
     ClockId::pid_cpu_clock_id(nix::unistd::Pid::this())
         .map(ClockId::now)
-        .expect("assert failed")
-        .expect("assert failed");
+        .unwrap()
+        .unwrap();
 }
-- 
cgit v1.2.3