From 42573eae5989dd5f67c341877ef2ee37ef8f24c0 Mon Sep 17 00:00:00 2001 From: Robert Fairley Date: Wed, 3 Apr 2019 12:25:04 -0400 Subject: [PATCH] tests/test-admin-deploy-none: Split grub.cfg directory and file creation Split the creation of the directory containing grub.cfg, and the creation of the file, so that a failure in the mkdir command will fail the test and not attempt the touch command. Closes: #1831 Approved by: jlebon --- tests/test-admin-deploy-none.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test-admin-deploy-none.sh b/tests/test-admin-deploy-none.sh index d798e60e..66a1491f 100755 --- a/tests/test-admin-deploy-none.sh +++ b/tests/test-admin-deploy-none.sh @@ -37,7 +37,8 @@ setup_os_repository "archive" "sysroot.bootloader none" ${CMD_PREFIX} ostree pull-local --repo=sysroot/ostree/repo --remote testos testos-repo testos/buildmaster/x86_64-runtime # Test that configuring sysroot.bootloader="none" is a workaround for previous # grub2 bootloader issue (see https://github.com/ostreedev/ostree/issues/1774) -mkdir -p sysroot/boot/grub2 && touch sysroot/boot/grub2/grub.cfg +mkdir -p sysroot/boot/grub2 +touch sysroot/boot/grub2/grub.cfg ${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os testos testos/buildmaster/x86_64-runtime > out.txt assert_file_has_content out.txt "Bootloader updated.*" assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.* root=LABEL=MOO'