shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-03 05:18:24 +03:00
Code Issues Projects Releases Wiki Activity

rust: Drop openat dependency

Browse Source 
We can use cap-std in our tests.
This commit is contained in:
Colin Walters 2022-11-11 15:11:55 -05:00
parent bef337e1bd
commit 8d08e563b4
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -51,7 +51,6 @@ thiserror = "1.0.20"
[dev-dependencies] [dev-dependencies]
maplit = "1.0.2" maplit = "1.0.2"
openat = "0.1.19"
tempfile = "3" tempfile = "3"
cap-tempfile = "0.25" cap-tempfile = "0.25"

18
rust-bindings/tests/repo/checkout_at.rs
View File

@ -1,4 +1,6 @@
use crate::util::*; use crate::util::*;
use cap_std::fs::Dir;
use cap_tempfile::cap_std;
use ostree::*; use ostree::*;
use std::os::unix::io::AsRawFd; 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 checksum = test_repo.test_commit("test");
let checkout_dir = tempfile::tempdir().expect("checkout dir"); 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 test_repo
.repo .repo
.checkout_at( .checkout_at(
None, None,
dirfd.as_raw_fd(), dir.as_raw_fd(),
"test-checkout", "test-checkout",
&checksum, &checksum,
gio::Cancellable::NONE, gio::Cancellable::NONE,
@ -29,12 +31,12 @@ fn should_checkout_at_with_default_options() {
let checksum = test_repo.test_commit("test"); let checksum = test_repo.test_commit("test");
let checkout_dir = tempfile::tempdir().expect("checkout dir"); 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 test_repo
.repo .repo
.checkout_at( .checkout_at(
Some(&RepoCheckoutAtOptions::default()), Some(&RepoCheckoutAtOptions::default()),
dirfd.as_raw_fd(), dir.as_raw_fd(),
"test-checkout", "test-checkout",
&checksum, &checksum,
gio::Cancellable::NONE, gio::Cancellable::NONE,
@ -50,7 +52,7 @@ fn should_checkout_at_with_options() {
let checksum = test_repo.test_commit("test"); let checksum = test_repo.test_commit("test");
let checkout_dir = tempfile::tempdir().expect("checkout dir"); 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 test_repo
.repo .repo
.checkout_at( .checkout_at(
@ -61,7 +63,7 @@ fn should_checkout_at_with_options() {
devino_to_csum_cache: Some(RepoDevInoCache::new()), devino_to_csum_cache: Some(RepoDevInoCache::new()),
..Default::default() ..Default::default()
}), }),
dirfd.as_raw_fd(), dir.as_raw_fd(),
"test-checkout", "test-checkout",
&checksum, &checksum,
gio::Cancellable::NONE, gio::Cancellable::NONE,
@ -80,7 +82,7 @@ fn should_checkout_at_with_filter() {
let checksum = test_repo.test_commit("test"); let checksum = test_repo.test_commit("test");
let checkout_dir = tempfile::tempdir().expect("checkout dir"); 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 test_repo
.repo .repo
.checkout_at( .checkout_at(
@ -94,7 +96,7 @@ fn should_checkout_at_with_filter() {
}), }),
..Default::default() ..Default::default()
}), }),
dirfd.as_raw_fd(), dir.as_raw_fd(),
"test-checkout", "test-checkout",
&checksum, &checksum,
gio::Cancellable::NONE, gio::Cancellable::NONE,