From 68fe816da9b779f0ad7ff8e4b5b975b4140090f3 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Thu, 18 Jun 2026 10:37:30 +0200 Subject: [PATCH] pvimg: Add more CCK tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add more CCK tests to make sure that new changes do not introduce a regression. Assisted-by: IBM Bob:1.0.4 Reviewed-by: Steffen Eiden Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- rust/pvimg/src/cli.rs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/rust/pvimg/src/cli.rs b/rust/pvimg/src/cli.rs index 652e500a..2c80bd53 100644 --- a/rust/pvimg/src/cli.rs +++ b/rust/pvimg/src/cli.rs @@ -718,6 +718,22 @@ mod test { flat_map_collect(insert(mvca.clone(), vec![CliOption::new("image-key", ["--image-key", "/dev/null"])])), flat_map_collect(insert(mvca.clone(), vec![CliOption::new("enable-image-encryption", ["--enable-image-encryption"]), CliOption::new("image-key", ["--image-key", "/dev/null"])])), + + // cck-available group tests: valid combinations + // --enable-cck-extension-secret with --cck + flat_map_collect(insert(mvca.clone(), vec![CliOption::new("enable-cck-extension-secret", ["--enable-cck-extension-secret"]), + CliOption::new("cck", ["--cck", "/dev/null"])])), + // --cck with --enable-cck-update (both cck-available options together) + flat_map_collect(insert(mvca.clone(), vec![CliOption::new("cck", ["--cck", "/dev/null"]), + CliOption::new("enable-cck-update", ["--enable-cck-update"])])), + // --enable-dump with --enable-cck-update (no --cck required as cck-update allows to set a CCK) + flat_map_collect(insert(mvca.clone(), vec![CliOption::new("enable-dump", ["--enable-dump"]), + CliOption::new("enable-cck-update", ["--enable-cck-update"])])), + // --cck standalone (without any requiring options) + flat_map_collect(insert(mvca.clone(), vec![CliOption::new("cck", ["--cck", "/dev/null"])])), + // --comm-key with --enable-cck-update (alias test) + flat_map_collect(insert(mvca.clone(), vec![CliOption::new("comm-key", ["--comm-key", "/dev/null"]), + CliOption::new("enable-cck-update", ["--enable-cck-update"])])), ]; let invalid_create_args = [ flat_map_collect(remove(mvcanv.clone(), "no-verify")), @@ -759,6 +775,14 @@ mod test { // exclusive. flat_map_collect(insert(mvca.clone(), vec![CliOption::new("disable-image-encryption", ["--disable-image-encryption"]), CliOption::new("image-key", ["--image-key", "/dev/null"])])), + + // cck-available group tests: invalid combinations + // --enable-cck-extension-secret without cck-available + flat_map_collect(insert(mvca.clone(), vec![CliOption::new("enable-cck-extension-secret", ["--enable-cck-extension-secret"])])), + // --enable-cck-extension-secret with --enable-cck-update and --cck (conflict takes precedence) + flat_map_collect(insert(mvca.clone(), vec![CliOption::new("enable-cck-extension-secret", ["--enable-cck-extension-secret"]), + CliOption::new("enable-cck-update", ["--enable-cck-update"]), + CliOption::new("cck", ["--cck", "/dev/null"])])), ]; let mut genprotimg_valid_args = vec![