github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 06:24:00 +00:00
Code Issues Projects Releases Wiki Activity

tests: Tidy up the format_mount tests

Browse Source 
- Consistently use env variables
- Use simpler cleanup code

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer
2017-09-17 20:23:50 +01:00
parent 59a085efc0
commit a9538a57d4
6 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/cases/040_packages/006_format_mount/000_auto/test.sh
View File

@@ -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"

9
test/cases/040_packages/006_format_mount/001_by_label/test.sh
View File

@@ -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"

11
test/cases/040_packages/006_format_mount/002_by_name/test.sh
View File

@@ -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"

10
test/cases/040_packages/006_format_mount/003_btrfs/test.sh
View File

@@ -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"

9
test/cases/040_packages/006_format_mount/004_xfs/test.sh
View File

@@ -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"

10
test/cases/040_packages/006_format_mount/010_multiple/test.sh
View File

@@ -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"