From a9538a57d4e1edc7ba8b1bea72008f6e6fc44d6c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Sep 2017 20:23:50 +0100 Subject: [PATCH] tests: Tidy up the format_mount tests - Consistently use env variables - Use simpler cleanup code Signed-off-by: Rolf Neugebauer --- .../040_packages/006_format_mount/000_auto/test.sh | 9 ++++----- .../006_format_mount/001_by_label/test.sh | 9 ++++----- .../040_packages/006_format_mount/002_by_name/test.sh | 11 +++++------ .../040_packages/006_format_mount/003_btrfs/test.sh | 10 +++++----- .../040_packages/006_format_mount/004_xfs/test.sh | 9 ++++----- .../006_format_mount/010_multiple/test.sh | 10 +++++----- 6 files changed, 27 insertions(+), 31 deletions(-) diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.sh b/test/cases/040_packages/006_format_mount/000_auto/test.sh index 59285cd34..3e1064584 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.sh +++ b/test/cases/040_packages/006_format_mount/000_auto/test.sh @@ -10,16 +10,15 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.sh b/test/cases/040_packages/006_format_mount/001_by_label/test.sh index 355e50bd0..58fac1bd9 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.sh +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.sh @@ -10,16 +10,15 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.sh b/test/cases/040_packages/006_format_mount/002_by_name/test.sh index 932b28779..603342be4 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.sh +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.sh @@ -10,14 +10,13 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; - rm -rf test.yml || true + rm -rf ${NAME}-* ${DISK} test.yml } - trap clean_up EXIT -# Test code goes here + if [ "${RT_OS}" = "osx" ]; then DEVICE="/dev/vda" else @@ -25,8 +24,8 @@ else fi sed -e "s,@DEVICE@,${DEVICE},g" test.yml.in > test.yml -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.sh b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh index 610f0b2bb..cec0f437f 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.sh +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh @@ -10,16 +10,16 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" + +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.sh b/test/cases/040_packages/006_format_mount/004_xfs/test.sh index 94338119b..b35b9db05 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.sh +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.sh @@ -10,16 +10,15 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK=disk.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.sh b/test/cases/040_packages/006_format_mount/010_multiple/test.sh index def83dd47..41fa9db78 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.sh +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.sh @@ -10,16 +10,16 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" NAME=test-format +DISK1=disk1.img +DISK2=disk2.img clean_up() { - find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf ${NAME}-* ${DISK1} ${DISK2} } - trap clean_up EXIT -# Test code goes here -moby build -name ${NAME} -format kernel+initrd test.yml -RESULT="$(linuxkit run -disk file=${NAME}1.img,size=512M -disk file=${NAME}2.img,size=512M ${NAME})" +moby build -format kernel+initrd -name ${NAME} test.yml +RESULT="$(linuxkit run -disk file=${DISK1},size=512M -disk file=${DISK2},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED"