shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2957 from cgwalters/transaction-test-suppress-global-sync

Browse Source 
tests/destructive: Turn off global sync()
This commit is contained in:
Eric Curtin 2023-07-31 10:55:39 +01:00 committed by GitHub
commit fd968d5939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,6 +388,17 @@ fn impl_transaction_test<M: AsRef<str>>(
assert_ne!(commitstates.booted.as_str(), commitstates.target.as_str()); assert_ne!(commitstates.booted.as_str(), commitstates.target.as_str());
// Also verify we didn't do a global sync()
{
let out = cmd!(
sh,
"journalctl -u ostree-finalize-staged --grep='Starting global sync'"
)
.ignore_status()
.read()?;
assert!(!out.contains("Starting global sync"));
}
let rt = tokio::runtime::Runtime::new()?; let rt = tokio::runtime::Runtime::new()?;
let cycle_time_ms = (tdata.cycle_time.as_secs_f64() * 1000f64 * FORCE_REBOOT_AFTER_MUL) as u64; let cycle_time_ms = (tdata.cycle_time.as_secs_f64() * 1000f64 * FORCE_REBOOT_AFTER_MUL) as u64;
// Set when we're trying an interrupt strategy that isn't a reboot, so we will // Set when we're trying an interrupt strategy that isn't a reboot, so we will
@ -537,6 +548,18 @@ fn impl_transaction_test<M: AsRef<str>>(
} }
} }
// See ostree-sysroot.c; we want this off for our tests
fn suppress_ostree_global_sync(sh: &xshell::Shell) -> Result<()> {
let dropindir = "/etc/systemd/system/ostree-finalize-staged.service.d";
std::fs::create_dir_all(dropindir)?;
std::fs::write(
Path::new(dropindir).join("50-suppress-sync.conf"),
"[Service]\nEnvironment=OSTREE_SYSROOT_OPTS=skip-sync\n",
)?;
cmd!(sh, "systemctl daemon-reload").run()?;
Ok(())
}
pub(crate) fn itest_transactionality() -> Result<()> { pub(crate) fn itest_transactionality() -> Result<()> {
let sh = xshell::Shell::new()?; let sh = xshell::Shell::new()?;
testinit()?; testinit()?;
@ -582,6 +605,7 @@ pub(crate) fn itest_transactionality() -> Result<()> {
// in our reboots, and it currently fails to start. The less // in our reboots, and it currently fails to start. The less
// we have in each reboot, the faster reboots are. // we have in each reboot, the faster reboots are.
cmd!(sh, "systemctl disable --now zincati").run()?; cmd!(sh, "systemctl disable --now zincati").run()?;
suppress_ostree_global_sync(&sh)?;
// And prepare for updates // And prepare for updates
cmd!(sh, "rpm-ostree cleanup -pr").run()?; cmd!(sh, "rpm-ostree cleanup -pr").run()?;
generate_update(&commit)?; generate_update(&commit)?;