diff options
| author | Colin Walters <walters@verbum.org> | 2021-04-07 17:37:26 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2021-04-07 18:00:57 +0000 |
| commit | 642dcd10efabb60763a465eb6babf9bafe7f0d90 (patch) | |
| tree | c481adc18890e53552c103908f6b71e41ebb26e8 | |
| parent | 35d4e657e7a3cd38dca34b412632706cbaf4a5db (diff) | |
| download | ostree-642dcd10efabb60763a465eb6babf9bafe7f0d90.tar.gz | |
tests/inst: Update ostree crate
| -rw-r--r-- | tests/inst/Cargo.toml | 2 | ||||
| -rw-r--r-- | tests/inst/src/destructive.rs | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/inst/Cargo.toml b/tests/inst/Cargo.toml index 0986c0a7..65252330 100644 --- 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 59ab59b1..26dba6b2 100644 --- 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(), } }; |