From 35b4131bd7cc8164c70cf79d3f8ae566902b43a0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 8 Jul 2016 10:54:11 -0400 Subject: [PATCH] tests: Fix karg tests on ostree-booted system https://github.com/ostreedev/ostree/pull/372 caused these tests to start failing when the host system is managed using ostree - since the tests *do* replace the `ostree=` kernel argument. Closes: #384 Approved by: cgwalters --- tests/test-admin-deploy-karg.sh | 7 ++++++- tests/test-admin-instutil-set-kargs.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/test-admin-deploy-karg.sh b/tests/test-admin-deploy-karg.sh index 1165b428..b7305f4c 100755 --- a/tests/test-admin-deploy-karg.sh +++ b/tests/test-admin-deploy-karg.sh @@ -44,7 +44,12 @@ echo "ok deploy with --karg, but same config" ${CMD_PREFIX} ostree admin deploy --karg-proc-cmdline --os=testos testos:testos/buildmaster/x86_64-runtime for arg in $(cat /proc/cmdline); do - assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg" + case "$arg" in + ostree=*) # Skip ostree arg that gets stripped out + ;; + *) assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg" + ;; + esac done echo "ok deploy --karg-proc-cmdline" diff --git a/tests/test-admin-instutil-set-kargs.sh b/tests/test-admin-instutil-set-kargs.sh index d2abec2e..40f4b746 100755 --- a/tests/test-admin-instutil-set-kargs.sh +++ b/tests/test-admin-instutil-set-kargs.sh @@ -55,6 +55,11 @@ echo "ok instutil set-kargs --append" ${CMD_PREFIX} ostree admin instutil set-kargs --import-proc-cmdline for arg in $(cat /proc/cmdline); do - assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg" + case "$arg" in + ostree=*) # Skip ostree arg that gets stripped out + ;; + *) assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg" + ;; + esac done echo "ok instutil set-kargs --import-proc-cmdline"