diff options
| author | Colin Walters <walters@verbum.org> | 2016-07-08 10:54:11 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-07-11 16:46:07 +0000 |
| commit | 35b4131bd7cc8164c70cf79d3f8ae566902b43a0 (patch) | |
| tree | 33cb418b9f9f5f0b4bbaf3114d150b61a60fa5aa /tests/test-admin-deploy-karg.sh | |
| parent | 4ebcd57fec0a6e79a40dc18991839afa7ba482bc (diff) | |
| download | ostree-35b4131bd7cc8164c70cf79d3f8ae566902b43a0.tar.gz | |
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
Diffstat (limited to 'tests/test-admin-deploy-karg.sh')
| -rwxr-xr-x | tests/test-admin-deploy-karg.sh | 7 |
1 files changed, 6 insertions, 1 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" |