tests/inst: Update ostree crate

diff --git a/tests/inst/Cargo.toml b/tests/inst/Cargo.toml
index 0986c0a71d011a9a19547f153ad49a098fb578db..652523306f47b43f0cc706b6ac974e881a20efb4 100644 (file)
--- a/tests/inst/Cargo.toml
+++ b/tests/inst/Cargo.toml
@@ -19,7 +19,7 @@ anyhow = "1.0"
 tempfile = "3.1.0"
 glib = "0.10"
 gio = "0.9"
-ostree = { version = "0.8.0", features = ["v2020_1"] }
+ostree = { version = "0.10.0", features = ["v2021_1"] }
 libtest-mimic = "0.3.0"
 twoway = "0.2.1"
 hyper = "0.13"

diff --git a/tests/inst/src/destructive.rs b/tests/inst/src/destructive.rs
index 59ab59b1d0bae49044414ab4e0d1bfb1e13838fa..26dba6b2c0094f66f54b26b221b3f1379e2849a8 100644 (file)
--- a/tests/inst/src/destructive.rs
+++ b/tests/inst/src/destructive.rs
@@ -279,7 +279,7 @@ fn parse_and_validate_reboot_mark<M: AsRef<str>>(
         // Update the target state
         let srvrepo_obj = ostree::Repo::new(&gio::File::new_for_path(SRVREPO));
         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 {
         println!(
             "Failed update to {} (booted={})",
@@ -353,11 +353,12 @@ fn impl_transaction_test<M: AsRef<str>>(
 
         CommitStates {
             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
                 .resolve_rev(&format!("{}^", TESTREF), false)?
+                .unwrap()
                 .into(),
-            target: srvrepo_obj.resolve_rev(TESTREF, false)?.into(),
+            target: srvrepo_obj.resolve_rev(TESTREF, false)?.unwrap().into(),
         }
     };