diff options
| author | Joseph Marrero Corchado <jmarrero@users.noreply.github.com> | 2022-11-13 13:08:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-13 13:08:43 -0500 |
| commit | 0dbd87c01724e1c2291c693eec255b068b4856a8 (patch) | |
| tree | bfe002ef32714879e84bbe0ce785a71b9567197d | |
| parent | ba39acf942273ee340484ffd8f9093003ec55acb (diff) | |
| parent | 8d08e563b4122604fde8b3994605cda9be6b82b9 (diff) | |
| download | ostree-0dbd87c01724e1c2291c693eec255b068b4856a8.tar.gz | |
Merge pull request #2765 from cgwalters/drop-openat
rust: Drop `openat` dependency
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | rust-bindings/tests/repo/checkout_at.rs | 18 |
2 files changed, 10 insertions, 9 deletions
@@ -51,7 +51,6 @@ thiserror = "1.0.20" [dev-dependencies] maplit = "1.0.2" -openat = "0.1.19" tempfile = "3" cap-tempfile = "1.0" diff --git a/rust-bindings/tests/repo/checkout_at.rs b/rust-bindings/tests/repo/checkout_at.rs index 7cc6b114..5c07b992 100644 --- a/rust-bindings/tests/repo/checkout_at.rs +++ b/rust-bindings/tests/repo/checkout_at.rs @@ -1,4 +1,6 @@ use crate::util::*; +use cap_std::fs::Dir; +use cap_tempfile::cap_std; use ostree::*; use std::os::unix::io::AsRawFd; @@ -8,12 +10,12 @@ fn should_checkout_at_with_none_options() { let checksum = test_repo.test_commit("test"); let checkout_dir = tempfile::tempdir().expect("checkout dir"); - let dirfd = openat::Dir::open(checkout_dir.path()).expect("openat"); + let dir = Dir::open_ambient_dir(checkout_dir.path(), cap_std::ambient_authority()).unwrap(); test_repo .repo .checkout_at( None, - dirfd.as_raw_fd(), + dir.as_raw_fd(), "test-checkout", &checksum, gio::Cancellable::NONE, @@ -29,12 +31,12 @@ fn should_checkout_at_with_default_options() { let checksum = test_repo.test_commit("test"); let checkout_dir = tempfile::tempdir().expect("checkout dir"); - let dirfd = openat::Dir::open(checkout_dir.path()).expect("openat"); + let dir = Dir::open_ambient_dir(checkout_dir.path(), cap_std::ambient_authority()).unwrap(); test_repo .repo .checkout_at( Some(&RepoCheckoutAtOptions::default()), - dirfd.as_raw_fd(), + dir.as_raw_fd(), "test-checkout", &checksum, gio::Cancellable::NONE, @@ -50,7 +52,7 @@ fn should_checkout_at_with_options() { let checksum = test_repo.test_commit("test"); let checkout_dir = tempfile::tempdir().expect("checkout dir"); - let dirfd = openat::Dir::open(checkout_dir.path()).expect("openat"); + let dir = Dir::open_ambient_dir(checkout_dir.path(), cap_std::ambient_authority()).unwrap(); test_repo .repo .checkout_at( @@ -61,7 +63,7 @@ fn should_checkout_at_with_options() { devino_to_csum_cache: Some(RepoDevInoCache::new()), ..Default::default() }), - dirfd.as_raw_fd(), + dir.as_raw_fd(), "test-checkout", &checksum, gio::Cancellable::NONE, @@ -80,7 +82,7 @@ fn should_checkout_at_with_filter() { let checksum = test_repo.test_commit("test"); let checkout_dir = tempfile::tempdir().expect("checkout dir"); - let dirfd = openat::Dir::open(checkout_dir.path()).expect("openat"); + let dir = Dir::open_ambient_dir(checkout_dir.path(), cap_std::ambient_authority()).unwrap(); test_repo .repo .checkout_at( @@ -94,7 +96,7 @@ fn should_checkout_at_with_filter() { }), ..Default::default() }), - dirfd.as_raw_fd(), + dir.as_raw_fd(), "test-checkout", &checksum, gio::Cancellable::NONE, |