gitea-mirror/rosenpass
1
0
Fork 0
mirror of https://github.com/rosenpass/rosenpass.git synced 2026-02-28 22:43:26 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: cleanup fd.rs tests

Browse Source 
Trigger the internal assert of owned.rs instead of writing our own. To
correctly test it use `should_panic` macro.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren
2024-08-19 13:18:56 +02:00
committed by Karolin Varner
parent 624d8d2f44
commit 9f78531979
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
util/src/fd.rs
View File

@@ -13,11 +13,6 @@ use crate::{mem::Forgetting, result::OkExt};
/// The old file descriptor is masked to avoid potential use after free (on file descriptor) /// The old file descriptor is masked to avoid potential use after free (on file descriptor)
/// in case the given file descriptor is still used somewhere /// in case the given file descriptor is still used somewhere
pub fn claim_fd(fd: RawFd) -> rustix::io::Result<OwnedFd> { pub fn claim_fd(fd: RawFd) -> rustix::io::Result<OwnedFd> {
// check if valid fd
if !(0..=i32::MAX).contains(&fd) {
return Err(rustix::io::Errno::BADF);
}
let new = clone_fd_cloexec(unsafe { BorrowedFd::borrow_raw(fd) })?; let new = clone_fd_cloexec(unsafe { BorrowedFd::borrow_raw(fd) })?;
mask_fd(fd)?; mask_fd(fd)?;
Ok(new) Ok(new)
@@ -268,25 +263,17 @@ mod tests {
} }
#[test] #[test]
fn test_claim_fd_invalid() { #[should_panic(expected = "fd != u32::MAX as RawFd")]
fn test_claim_fd_invalid_neg() {
let fd: RawFd = -1; let fd: RawFd = -1;
let result = claim_fd(fd); let _ = claim_fd(fd);
assert!(result.is_err());
assert_eq!(
result.unwrap_err().to_string(),
"Bad file descriptor (os error 9)"
);
} }
#[test] #[test]
#[should_panic(expected = "fd != u32::MAX as RawFd")]
fn test_claim_fd_invalid_max() { fn test_claim_fd_invalid_max() {
let fd: RawFd = i64::MAX as RawFd; let fd: RawFd = i64::MAX as RawFd;
let result = claim_fd(fd); let _ = claim_fd(fd);
assert!(result.is_err());
assert_eq!(
result.unwrap_err().to_string(),
"Bad file descriptor (os error 9)"
);
} }
#[test] #[test]