packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/inst: Update ostree crate

This commit is contained in:
Colin Walters 2021-04-07 17:37:26 +00:00
parent 35d4e657e7
commit 642dcd10ef
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/inst/Cargo.toml
View File

@ -19,7 +19,7 @@ anyhow = "1.0"
tempfile = "3.1.0" tempfile = "3.1.0"
glib = "0.10" glib = "0.10"
gio = "0.9" gio = "0.9"
ostree = { version = "0.8.0", features = ["v2020_1"] } ostree = { version = "0.10.0", features = ["v2021_1"] }
libtest-mimic = "0.3.0" libtest-mimic = "0.3.0"
twoway = "0.2.1" twoway = "0.2.1"
hyper = "0.13" hyper = "0.13"

7
tests/inst/src/destructive.rs
View File

@ -279,7 +279,7 @@ fn parse_and_validate_reboot_mark<M: AsRef<str>>(
// Update the target state // Update the target state
let srvrepo_obj = ostree::Repo::new(&gio::File::new_for_path(SRVREPO)); let srvrepo_obj = ostree::Repo::new(&gio::File::new_for_path(SRVREPO));
srvrepo_obj.open(gio::NONE_CANCELLABLE)?; srvrepo_obj.open(gio::NONE_CANCELLABLE)?;
commitstates.target = srvrepo_obj.resolve_rev(TESTREF, false)?.into(); commitstates.target = srvrepo_obj.resolve_rev(TESTREF, false)?.unwrap().into();
} else if commitstates.booted == commitstates.orig || commitstates.booted == commitstates.prev { } else if commitstates.booted == commitstates.orig || commitstates.booted == commitstates.prev {
println!( println!(
"Failed update to {} (booted={})", "Failed update to {} (booted={})",
@ -353,11 +353,12 @@ fn impl_transaction_test<M: AsRef<str>>(
CommitStates { CommitStates {
booted: booted_commit.to_string(), booted: booted_commit.to_string(),
orig: sysrepo_obj.resolve_rev(ORIGREF, false)?.into(), orig: sysrepo_obj.resolve_rev(ORIGREF, false)?.unwrap().into(),
prev: srvrepo_obj prev: srvrepo_obj
.resolve_rev(&format!("{}^", TESTREF), false)? .resolve_rev(&format!("{}^", TESTREF), false)?
.unwrap()
.into(), .into(),
target: srvrepo_obj.resolve_rev(TESTREF, false)?.into(), target: srvrepo_obj.resolve_rev(TESTREF, false)?.unwrap().into(),
} }
}; };