From: Dan Nicholson Date: Fri, 13 May 2016 12:53:01 -0700 Subject: tests: Improve check for /proc/cmdline kargs On some systems there may be no root= argument, so the tests for appending /proc/cmdline arguments will fail. Instead, loop over each of the arguments in the host's /proc/cmdline and test that they're in the constructed config file. That will actually test if ostree added all of the system's /proc/cmdline args correctly. The regex isn't perfect here, but it's probably good enough for this test. Closes: #372 Approved by: cgwalters Origin: upstream, commit:https://github.com/ostreedev/ostree/commit/a94530111a31ff3784af293a6cd4da4c3c7bc34c --- tests/test-admin-deploy-karg.sh | 7 +++---- tests/test-admin-instutil-set-kargs.sh | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/test-admin-deploy-karg.sh b/tests/test-admin-deploy-karg.sh index 2ce8862..1165b42 100755 --- a/tests/test-admin-deploy-karg.sh +++ b/tests/test-admin-deploy-karg.sh @@ -43,10 +43,9 @@ assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'option echo "ok deploy with --karg, but same config" ${CMD_PREFIX} ostree admin deploy --karg-proc-cmdline --os=testos testos:testos/buildmaster/x86_64-runtime -# Here we're asserting that the *host* system has a root= kernel -# argument. I think it's unlikely that anyone doesn't have one, but -# if this is not true for you, please file a bug! -assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*root=.' +for arg in $(cat /proc/cmdline); do + assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg" +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 0af940f..d2abec2 100755 --- a/tests/test-admin-instutil-set-kargs.sh +++ b/tests/test-admin-instutil-set-kargs.sh @@ -54,8 +54,7 @@ assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'option echo "ok instutil set-kargs --append" ${CMD_PREFIX} ostree admin instutil set-kargs --import-proc-cmdline -# Here we're asserting that the *host* system has a root= kernel -# argument. I think it's unlikely that anyone doesn't have one, but -# if this is not true for you, please file a bug! -assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*root=.' +for arg in $(cat /proc/cmdline); do + assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg" +done echo "ok instutil set-kargs --import-proc-cmdline"