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

tests: Fix karg tests on ostree-booted system

Browse Source 
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
This commit is contained in:
Colin Walters 2016-07-08 10:54:11 -04:00 committed by Atomic Bot
parent 4ebcd57fec
commit 35b4131bd7
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test-admin-deploy-karg.sh
View File

@ -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 ${CMD_PREFIX} ostree admin deploy --karg-proc-cmdline --os=testos testos:testos/buildmaster/x86_64-runtime
for arg in $(cat /proc/cmdline); do 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 done
echo "ok deploy --karg-proc-cmdline" echo "ok deploy --karg-proc-cmdline"

7
tests/test-admin-instutil-set-kargs.sh
View File

@ -55,6 +55,11 @@ echo "ok instutil set-kargs --append"
${CMD_PREFIX} ostree admin instutil set-kargs --import-proc-cmdline ${CMD_PREFIX} ostree admin instutil set-kargs --import-proc-cmdline
for arg in $(cat /proc/cmdline); do 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 done
echo "ok instutil set-kargs --import-proc-cmdline" echo "ok instutil set-kargs --import-proc-cmdline"