tests/inst: convert more sh-inline to xshell

Part of #2857

Author: samzeter

tests/inst/src/destructive.rs

@@ -25,7 +25,6 @@ use ostree_ext::ostree;
 use rand::seq::SliceRandom;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
-use sh_inline::bash;
 use std::collections::BTreeMap;
 use std::io::Write;
 use std::path::Path;
@@ -132,12 +131,15 @@ impl InterruptStrategy {
 
 /// TODO add readonly sysroot handling into base ostree
 fn testinit() -> Result<()> {
+    let sh = xshell::Shell::new()?;
     assert!(std::path::Path::new("/run/ostree-booted").exists());
-    bash!(
+    cmd!(
+        sh,
         r"if ! test -w /sysroot; then
    mount -o remount,rw /sysroot
 fi"
-    )?;
+    )
+    .run()?;
     Ok(())
 }
 
@@ -146,16 +148,19 @@ fi"
 /// reworked the tree mutation to operate on an ostree repo
 /// rather than a filesystem.
 fn generate_update(commit: &str) -> Result<()> {
+    let sh = xshell::Shell::new()?;
     println!("Generating update from {}", commit);
     crate::treegen::update_os_tree(SRVREPO, TESTREF, TREEGEN_PERCENTAGE)
         .context("Failed to generate new content")?;
     // Amortize the prune across multiple runs; we don't want to leak space,
     // but traversing all the objects is expensive.  So here we only prune 1/5 of the time.
     if rand::thread_rng().gen_ratio(1, 5) {
-        bash!(
+        cmd!(
+            sh,
             "ostree --repo=${srvrepo} prune --refs-only --depth=1",
             srvrepo = SRVREPO
-        )?;
+        )
+        .run()?;
     }
     Ok(())
 }
@@ -165,7 +170,9 @@ fn generate_update(commit: &str) -> Result<()> {
 /// and then teach our webserver to redirect to the system for objects it doesn't
 /// have.
 fn generate_srv_repo(commit: &str) -> Result<()> {
-    bash!(
+    let sh = xshell::Shell::new()?;
+    cmd!(
+        sh,
         r#"
         ostree --repo=${srvrepo} init --mode=archive
         ostree --repo=${srvrepo} config set archive.zlib-level 1
@@ -176,6 +183,7 @@ fn generate_srv_repo(commit: &str) -> Result<()> {
         commit = commit,
         testref = TESTREF
     )
+    .run()
     .context("Failed to generate srv repo")?;
     generate_update(commit)?;
     Ok(())
@@ -200,11 +208,14 @@ struct RebootStats {
 }
 
 fn upgrade_and_finalize() -> Result<()> {
-    bash!(
+    let sh = xshell::Shell::new()?;
+    cmd!(
+        sh,
         "rpm-ostree upgrade
         systemctl start ostree-finalize-staged
         systemctl stop ostree-finalize-staged"
     )
+    .run()
     .context("Upgrade and finalize failed")?;
     Ok(())
 }
@@ -309,9 +320,10 @@ fn parse_and_validate_reboot_mark<M: AsRef<str>>(
 }
 
 fn validate_pending_commit(pending_commit: &str, commitstates: &CommitStates) -> Result<()> {
+    let sh = xshell::Shell::new()?;
     if pending_commit != commitstates.target {
-        bash!("rpm-ostree status -v")?;
-        bash!("ostree show ${pending_commit}", pending_commit)?;
+        cmd!(sh, "rpm-ostree status -v").run()?;
+        cmd!(sh, "ostree show ${pending_commit}", pending_commit).run()?;
         anyhow::bail!(
             "Expected target commit={} but pending={} ({:?})",
             commitstates.target,
@@ -622,7 +634,8 @@ pub(crate) fn itest_transactionality() -> Result<()> {
             // FIXME: make this saner
             let origref = ORIGREF;
             let testref = TESTREF;
-            bash!(
+            cmd!(
+                sh,
                 "
                 ostree admin set-origin testrepo ${url} ${testref}
                 ostree refs --create testrepo:${testref} ${commit}
@@ -632,7 +645,8 @@ pub(crate) fn itest_transactionality() -> Result<()> {
                 origref,
                 testref,
                 commit
-            )?;
+            )
+            .run()?;
             // We gather a single "cycle time" at start as a way of gauging how
             // long an upgrade should take, so we know when to interrupt.  This
             // obviously has some pitfalls, mainly when there are e.g. other competing

tests/inst/src/repobin.rs

@@ -5,23 +5,28 @@ use std::path::Path;
 
 use crate::test::*;
 use anyhow::{Context, Result};
-use sh_inline::{bash, bash_command};
+use sh_inline::bash_command;
 use with_procspawn_tempdir::with_procspawn_tempdir;
+use xshell::cmd;
 
 pub(crate) fn itest_basic() -> Result<()> {
-    bash!(r"ostree --help >/dev/null")?;
+    let sh = xshell::Shell::new()?;
+    cmd!(sh, r"ostree --help >/dev/null").run()?;
     Ok(())
 }
 
 #[with_procspawn_tempdir]
 pub(crate) fn itest_nofifo() -> Result<()> {
+    let sh = xshell::Shell::new()?;
     assert!(std::path::Path::new(".procspawn-tmpdir").exists());
-    bash!(
+    cmd!(
+        sh,
         r"ostree --repo=repo init --mode=archive
     mkdir tmproot
     mkfifo tmproot/afile
 "
-    )?;
+    )
+    .run()?;
     cmd_fails_with(
         bash_command!(
             r#"ostree --repo=repo commit -b fifotest -s "commit fifo" --tree=dir=./tmproot"#
@@ -34,29 +39,38 @@ pub(crate) fn itest_nofifo() -> Result<()> {
 
 #[with_procspawn_tempdir]
 pub(crate) fn itest_mtime() -> Result<()> {
-    bash!(
+    let sh = xshell::Shell::new()?;
+    cmd!(
+        sh,
         r"ostree --repo=repo init --mode=archive
     mkdir tmproot
     echo afile > tmproot/afile
     ostree --repo=repo commit -b test --tree=dir=tmproot >/dev/null
 "
-    )?;
+    )
+    .run()?;
     let ts = Path::new("repo").metadata()?.modified().unwrap();
     std::thread::sleep(std::time::Duration::from_secs(1));
-    bash!(r#"ostree --repo=repo commit -b test -s "bump mtime" --tree=dir=tmproot >/dev/null"#)?;
+    cmd!(
+        sh,
+        r#"ostree --repo=repo commit -b test -s "bump mtime" --tree=dir=tmproot >/dev/null"#
+    )
+    .run()?;
     assert_ne!(ts, Path::new("repo").metadata()?.modified().unwrap());
     Ok(())
 }
 
 #[with_procspawn_tempdir]
 pub(crate) fn itest_extensions() -> Result<()> {
-    bash!(r"ostree --repo=repo init --mode=bare")?;
+    let sh = xshell::Shell::new()?;
+    cmd!(sh, r"ostree --repo=repo init --mode=bare").run()?;
     assert!(Path::new("repo/extensions").exists());
     Ok(())
 }
 
 #[with_procspawn_tempdir]
 pub(crate) fn itest_pull_basicauth() -> Result<()> {
+    let sh = xshell::Shell::new()?;
     let opts = TestHttpServerOpts {
         basicauth: true,
         ..Default::default()
@@ -72,7 +86,8 @@ pub(crate) fn itest_pull_basicauth() -> Result<()> {
         )?;
         let osroot = Path::new("osroot");
         crate::treegen::mkroot(&osroot)?;
-        bash!(
+        cmd!(
+            sh,
             r#"ostree --repo=${serverrepo} init --mode=archive
         ostree --repo=${serverrepo} commit -b os --tree=dir=${osroot} >/dev/null
         mkdir client
@@ -87,7 +102,8 @@ pub(crate) fn itest_pull_basicauth() -> Result<()> {
             baseuri = baseuri.to_string(),
             unauthuri = unauthuri.to_string(),
             authuri = authuri.to_string()
-        )?;
+        )
+        .run()?;
         for rem in &["unauth", "badauth"] {
             cmd_fails_with(
                 bash_command!(
@@ -99,7 +115,11 @@ pub(crate) fn itest_pull_basicauth() -> Result<()> {
             )
             .context(rem)?;
         }
-        bash!(r#"ostree --repo=client/repo pull origin-goodauth os >/dev/null"#,)?;
+        cmd!(
+            sh,
+            r#"ostree --repo=client/repo pull origin-goodauth os >/dev/null"#,
+        )
+        .run()?;
         Ok(())
     })?;
     Ok(())

tests/inst/src/treegen.rs

@@ -151,5 +151,5 @@ pub(crate) fn update_os_tree<P: AsRef<Path>>(
     assert!(mutated > 0);
     println!("Mutated ELF files: {}", mutated);
     let tempdir = tempdir.path();
-    cmd!(sh, "ostree --repo={repo_path} commit --consume -b {ostref} --base={ostref} --tree=dir={tempdir} --owner-uid 0 --owner-gid 0 --selinux-policy-from-base --link-checkout-speedup --no-bindings --no-xattrs").run().context("Failed to commit updated content")
+    cmd!(sh, "ostree --repo={repo_path} commit --consume -b {ostref} --base={ostref} --tree=dir={tempdir} --owner-uid 0 --owner-gid 0 --selinux-policy-from-base --link-checkout-speedup --no-bindings --no-xattrs").run().context("Failed to commit updated content")?
 }