tests/inst: Update to latest ostree-ext

(And glib, etc.)

diff --git a/tests/inst/Cargo.toml b/tests/inst/Cargo.toml
index c8773ad3ee9d14baee2f384a79424e3239e137a9..ff030b221558dfa109460d9e111f4310a70965c8 100644 (file)
--- a/tests/inst/Cargo.toml
+++ b/tests/inst/Cargo.toml
@@ -20,7 +20,7 @@ serde_json = "1.0"
 sh-inline = "0.4.0"
 anyhow = "1.0"
 tempfile = "3.1.0"
-ostree-ext = { version = "0.9" }
+ostree-ext = { version = "0.11" }
 libtest-mimic = "0.5.0"
 twoway = "0.2.1"
 hyper = { version = "0.14", features = ["runtime", "http1", "http2", "tcp", "server"] }

diff --git a/tests/inst/src/destructive.rs b/tests/inst/src/destructive.rs
index eb04d68be43094d3e4c237d88090a97433357ede..3fbbe92c6e925b885d73192137f6ec753de3ba51 100644 (file)
--- a/tests/inst/src/destructive.rs
+++ b/tests/inst/src/destructive.rs
@@ -287,7 +287,7 @@ fn parse_and_validate_reboot_mark<M: AsRef<str>>(
         generate_update(&firstdeploy.checksum)?;
         // Update the target state
         let srvrepo_obj = ostree::Repo::new(&gio::File::for_path(SRVREPO));
-        srvrepo_obj.open(gio::NONE_CANCELLABLE)?;
+        srvrepo_obj.open(gio::Cancellable::NONE)?;
         commitstates.target = srvrepo_obj.resolve_rev(TESTREF, false)?.unwrap().into();
     } else if commitstates.booted == commitstates.orig || commitstates.booted == commitstates.prev {
         println!(
@@ -357,9 +357,9 @@ fn impl_transaction_test<M: AsRef<str>>(
     // Gather the expected possible commits
     let mut commitstates = {
         let srvrepo_obj = ostree::Repo::new(&gio::File::for_path(SRVREPO));
-        srvrepo_obj.open(gio::NONE_CANCELLABLE)?;
+        srvrepo_obj.open(gio::Cancellable::NONE)?;
         let sysrepo_obj = ostree::Repo::new(&gio::File::for_path("/sysroot/ostree/repo"));
-        sysrepo_obj.open(gio::NONE_CANCELLABLE)?;
+        sysrepo_obj.open(gio::Cancellable::NONE)?;
 
         CommitStates {
             booted: booted_commit.to_string(),
@@ -569,7 +569,7 @@ pub(crate) fn itest_transactionality() -> Result<()> {
     sysroot.load(cancellable.as_ref())?;
     assert!(sysroot.is_booted());
     let booted = sysroot.booted_deployment().expect("booted deployment");
-    let commit: String = booted.csum().expect("booted csum").into();
+    let commit: String = booted.csum().into();
     // We need this static across reboots
     let srvrepo = Path::new(SRVREPO);
     let firstrun = !srvrepo.exists();

diff --git a/tests/inst/src/sysroot.rs b/tests/inst/src/sysroot.rs
index 19377134c12f77deabcf985d9674bc1d78485513..6e65f35f183ee839cbfc37168bd28c04aa462bab 100644 (file)
--- a/tests/inst/src/sysroot.rs
+++ b/tests/inst/src/sysroot.rs
@@ -26,9 +26,9 @@ pub(crate) fn itest_sysroot_ro() -> Result<()> {
 
     let booted = sysroot.booted_deployment().expect("booted deployment");
     assert!(!booted.is_staged());
-    let repo = sysroot.repo().expect("repo");
+    let repo = sysroot.repo();
 
-    let csum = booted.csum().expect("booted csum");
+    let csum = booted.csum();
     let csum = csum.as_str();
 
     let (root, rev) = repo.read_commit(csum, cancellable.as_ref())?;