shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-10-26 08:55:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2997 from cgwalters/test-cleanups-1

Browse Source 
tests/destructive: Port more to xshell
This commit is contained in:
Joseph Marrero Corchado 2023-08-23 10:38:16 -04:00 committed by GitHub
commit 4451949213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,18 +511,22 @@ fn impl_transaction_test<M: AsRef<str>>(
// the interrupt strategy. // the interrupt strategy.
match strategy { match strategy {
InterruptStrategy::Force(ForceInterruptStrategy::Kill9) => { InterruptStrategy::Force(ForceInterruptStrategy::Kill9) => {
bash!( cmd!(sh, "systemctl kill -s KILL rpm-ostreed")
"systemctl kill -s KILL rpm-ostreed || true .ignore_status()
systemctl kill -s KILL ostree-finalize-staged || true .run()?;
systemctl kill -s KILL ostree-finalize-staged-hold || true" cmd!(sh, "systemctl kill -s KILL ostree-finalize-staged")
)?; .ignore_status()
.run()?;
cmd!(sh, "systemctl kill -s KILL ostree-finalize-staged-hold")
.ignore_status()
.run()?;
live_strategy = Some(strategy); live_strategy = Some(strategy);
} }
InterruptStrategy::Force(ForceInterruptStrategy::Reboot) => { InterruptStrategy::Force(ForceInterruptStrategy::Reboot) => {
mark.reboot_strategy = Some(strategy); mark.reboot_strategy = Some(strategy);
prepare_reboot(serde_json::to_string(&mark)?)?; prepare_reboot(serde_json::to_string(&mark)?)?;
// This is a forced reboot - no syncing of the filesystem. // This is a forced reboot - no syncing of the filesystem.
bash!("reboot -ff")?; cmd!(sh, "reboot -ff").run()?;
std::thread::sleep(time::Duration::from_secs(60)); std::thread::sleep(time::Duration::from_secs(60));
// Shouldn't happen // Shouldn't happen
anyhow::bail!("failed to reboot"); anyhow::bail!("failed to reboot");
@ -536,11 +540,15 @@ fn impl_transaction_test<M: AsRef<str>>(
// We either rebooted, or failed to reboot // We either rebooted, or failed to reboot
} }
InterruptStrategy::Polite(PoliteInterruptStrategy::Stop) => { InterruptStrategy::Polite(PoliteInterruptStrategy::Stop) => {
bash!( cmd!(sh, "systemctl stop rpm-ostreed")
"systemctl stop rpm-ostreed || true .ignore_status()
systemctl stop ostree-finalize-staged || true .run()?;
systemctl stop ostree-finalize-staged-hold || true" cmd!(sh, "systemctl stop ostree-finalize-staged")
)?; .ignore_status()
.run()?;
cmd!(sh, "systemctl stop ostree-finalize-staged-hold")
.ignore_status()
.run()?;
live_strategy = Some(strategy); live_strategy = Some(strategy);
} }
} }
@ -637,7 +645,7 @@ pub(crate) fn itest_transactionality() -> Result<()> {
let mut f = std::io::BufWriter::new(std::fs::File::create(&TDATAPATH)?); let mut f = std::io::BufWriter::new(std::fs::File::create(&TDATAPATH)?);
serde_json::to_writer(&mut f, &tdata)?; serde_json::to_writer(&mut f, &tdata)?;
f.flush()?; f.flush()?;
bash!("rpm-ostree status")?; cmd!(sh, "rpm-ostree status").run()?;
} }
let tdata = { let tdata = {