io-uring-test: Expect cqueue::Entry::result() to be Result<u32>

Author: asayers

io-uring-test/src/tests/cancel.rs

@@ -46,8 +46,11 @@ pub fn test_async_cancel_user_data<S: squeue::EntryMarker, C: cqueue::EntryMarke
     assert_eq!(cqes[0].user_data(), 2003);
     assert_eq!(cqes[1].user_data(), 2004);
 
-    assert_eq!(cqes[0].result(), -libc::ECANCELED); // -ECANCELED
-    assert_eq!(cqes[1].result(), 0); // the number of requests cancelled
+    assert_eq!(
+        cqes[0].result().unwrap_err().raw_os_error().unwrap(),
+        libc::ECANCELED
+    ); // -ECANCELED
+    assert_eq!(cqes[1].result().unwrap(), 0); // the number of requests cancelled
 
     Ok(())
 }
@@ -96,9 +99,15 @@ pub fn test_async_cancel_user_data_all<S: squeue::EntryMarker, C: cqueue::EntryM
     assert_eq!(cqes[1].user_data(), 2003);
     assert_eq!(cqes[2].user_data(), 2004);
 
-    assert_eq!(cqes[0].result(), -libc::ECANCELED); // -ECANCELED
-    assert_eq!(cqes[1].result(), -libc::ECANCELED); // -ECANCELED
-    assert_eq!(cqes[2].result(), 2); // the number of requests cancelled
+    assert_eq!(
+        cqes[0].result().unwrap_err().raw_os_error().unwrap(),
+        libc::ECANCELED
+    ); // -ECANCELED
+    assert_eq!(
+        cqes[1].result().unwrap_err().raw_os_error().unwrap(),
+        libc::ECANCELED
+    ); // -ECANCELED
+    assert_eq!(cqes[2].result().unwrap(), 2); // the number of requests cancelled
 
     Ok(())
 }
@@ -147,9 +156,15 @@ pub fn test_async_cancel_any<S: squeue::EntryMarker, C: cqueue::EntryMarker>(
     assert_eq!(cqes[1].user_data(), 2004);
     assert_eq!(cqes[2].user_data(), 2005);
 
-    assert_eq!(cqes[0].result(), -libc::ECANCELED); // -ECANCELED
-    assert_eq!(cqes[1].result(), -libc::ECANCELED);
-    assert_eq!(cqes[2].result(), 2); // the number of requests cancelled
+    assert_eq!(
+        cqes[0].result().unwrap_err().raw_os_error().unwrap(),
+        libc::ECANCELED
+    ); // -ECANCELED
+    assert_eq!(
+        cqes[1].result().unwrap_err().raw_os_error().unwrap(),
+        libc::ECANCELED
+    );
+    assert_eq!(cqes[2].result().unwrap(), 2); // the number of requests cancelled
 
     Ok(())
 }
@@ -196,8 +211,11 @@ pub fn test_async_cancel_fd<S: squeue::EntryMarker, C: cqueue::EntryMarker>(
     assert_eq!(cqes[0].user_data(), 2003);
     assert_eq!(cqes[1].user_data(), 2004);
 
-    assert_eq!(cqes[0].result(), -libc::ECANCELED); // -ECANCELED
-    assert_eq!(cqes[1].result(), 0);
+    assert_eq!(
+        cqes[0].result().unwrap_err().raw_os_error().unwrap(),
+        libc::ECANCELED
+    ); // -ECANCELED
+    assert_eq!(cqes[1].result().unwrap(), 0);
 
     Ok(())
 }
@@ -247,9 +265,15 @@ pub fn test_async_cancel_fd_all<S: squeue::EntryMarker, C: cqueue::EntryMarker>(
     assert_eq!(cqes[1].user_data(), 2004);
     assert_eq!(cqes[2].user_data(), 2005);
 
-    assert_eq!(cqes[0].result(), -libc::ECANCELED); // -ECANCELED
-    assert_eq!(cqes[1].result(), -libc::ECANCELED);
-    assert_eq!(cqes[2].result(), 2); // the number of requests cancelled
+    assert_eq!(
+        cqes[0].result().unwrap_err().raw_os_error().unwrap(),
+        libc::ECANCELED
+    ); // -ECANCELED
+    assert_eq!(
+        cqes[1].result().unwrap_err().raw_os_error().unwrap(),
+        libc::ECANCELED
+    );
+    assert_eq!(cqes[2].result().unwrap(), 2); // the number of requests cancelled
 
     Ok(())
 }

io-uring-test/src/tests/epoll.rs

@@ -61,7 +61,7 @@ pub fn test_ready<S: squeue::EntryMarker, C: cqueue::EntryMarker>(
         .next()
         .unwrap();
     assert_eq!(cqe.user_data(), REQ_TYPE_EPOLL_WAIT);
-    assert_eq!(cqe.result(), 2);
+    assert_eq!(cqe.result().unwrap(), 2);
 
     // read
 
@@ -114,8 +114,8 @@ pub fn test_not_ready<S: squeue::EntryMarker, C: cqueue::EntryMarker>(
     ring.submit_and_wait(1)?;
     for cqe in ring.completion().map(Into::<cqueue::Entry>::into).take(1) {
         assert_eq!(cqe.user_data(), REQ_TYPE_EPOLL_WAIT);
-        assert!(0 <= cqe.result() && cqe.result() <= 2);
-        nr = cqe.result();
+        assert!(cqe.result().unwrap() <= 2);
+        nr = cqe.result().unwrap();
     }
 
     // read
@@ -186,7 +186,7 @@ pub fn test_delete<S: squeue::EntryMarker, C: cqueue::EntryMarker>(
     for cqe in ring.completion().map(Into::<cqueue::Entry>::into).take(1) {
         assert_eq!(cqe.user_data(), REQ_TYPE_EPOLL_WAIT);
         // check for only one event
-        assert!(cqe.result() == 1);
+        assert_eq!(cqe.result().unwrap(), 1);
     }
 
     // check that both writes still happened
@@ -261,9 +261,9 @@ pub fn test_remove<S: squeue::EntryMarker, C: cqueue::EntryMarker>(
     ring.submit_and_wait(1)?;
     for cqe in ring.completion().map(Into::<cqueue::Entry>::into).take(1) {
         assert_eq!(cqe.user_data(), REQ_TYPE_EPOLL_WAIT);
-        let err = cqe.result();
+        let err = cqe.result().unwrap_err().raw_os_error().unwrap();
         // check that we got the expected errors
-        assert!([-::libc::EAGAIN, -::libc::EBADF].contains(&err));
+        assert!([libc::EAGAIN, libc::EBADF].contains(&err));
     }
 
     Ok(())
@@ -342,8 +342,7 @@ pub fn test_race<S: squeue::EntryMarker, C: cqueue::EntryMarker>(
                 .map(Into::<cqueue::Entry>::into)
                 .unwrap();
             assert_eq!(cqe.user_data(), REQ_TYPE_EPOLL_WAIT);
-            assert!(cqe.result() >= 0);
-            let nr = cqe.result();
+            let nr = cqe.result().unwrap();
 
             // process the events
             prune_read(&mut readers, &events, nr as _)?;