From 9a562a3b8cdd030bf1f5bb76275823a0bf986094 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Tue, 8 Aug 2017 11:58:21 +0100 Subject: [PATCH 1/3] tests: Fix ordering in package directory and add a note Signed-off-by: Dave Tucker --- .../{009_extend => 005_extend}/000_ext4/Dockerfile | 0 .../040_packages/{009_extend => 005_extend}/000_ext4/check.sh | 0 .../040_packages/{009_extend => 005_extend}/000_ext4/extend.sh | 0 .../{009_extend => 005_extend}/000_ext4/test-create.yml | 0 .../040_packages/{009_extend => 005_extend}/000_ext4/test.sh | 0 .../040_packages/{009_extend => 005_extend}/000_ext4/test.yml | 0 .../{009_extend => 005_extend}/001_btrfs/Dockerfile | 0 .../040_packages/{009_extend => 005_extend}/001_btrfs/check.sh | 0 .../{009_extend => 005_extend}/001_btrfs/extend.sh | 0 .../{009_extend => 005_extend}/001_btrfs/test-create.yml | 0 .../040_packages/{009_extend => 005_extend}/001_btrfs/test.sh | 0 .../040_packages/{009_extend => 005_extend}/001_btrfs/test.yml | 0 .../040_packages/{009_extend => 005_extend}/002_xfs/Dockerfile | 0 .../040_packages/{009_extend => 005_extend}/002_xfs/check.sh | 0 .../040_packages/{009_extend => 005_extend}/002_xfs/extend.sh | 0 .../{009_extend => 005_extend}/002_xfs/test-create.yml | 0 .../040_packages/{009_extend => 005_extend}/002_xfs/test.sh | 0 .../040_packages/{009_extend => 005_extend}/002_xfs/test.yml | 0 .../{008_format_mount => 006_format_mount}/000_auto/check.sh | 0 .../{008_format_mount => 006_format_mount}/000_auto/test.sh | 0 .../{008_format_mount => 006_format_mount}/000_auto/test.yml | 0 .../001_by_label/check.sh | 0 .../001_by_label/test.sh | 0 .../001_by_label/test.yml | 0 .../002_by_name/.gitignore | 0 .../002_by_name/check.sh | 0 .../{008_format_mount => 006_format_mount}/002_by_name/test.sh | 0 .../002_by_name/test.yml.in | 0 .../{008_format_mount => 006_format_mount}/003_btrfs/check.sh | 0 .../{008_format_mount => 006_format_mount}/003_btrfs/test.sh | 0 .../{008_format_mount => 006_format_mount}/003_btrfs/test.yml | 0 .../{008_format_mount => 006_format_mount}/004_xfs/check.sh | 0 .../{008_format_mount => 006_format_mount}/004_xfs/test.sh | 0 .../{008_format_mount => 006_format_mount}/004_xfs/test.yml | 0 .../010_multiple/check.sh | 0 .../010_multiple/test.sh | 0 .../010_multiple/test.yml | 0 test/cases/040_packages/README.md | 3 +++ 38 files changed, 3 insertions(+) rename test/cases/040_packages/{009_extend => 005_extend}/000_ext4/Dockerfile (100%) rename test/cases/040_packages/{009_extend => 005_extend}/000_ext4/check.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/000_ext4/extend.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/000_ext4/test-create.yml (100%) rename test/cases/040_packages/{009_extend => 005_extend}/000_ext4/test.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/000_ext4/test.yml (100%) rename test/cases/040_packages/{009_extend => 005_extend}/001_btrfs/Dockerfile (100%) rename test/cases/040_packages/{009_extend => 005_extend}/001_btrfs/check.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/001_btrfs/extend.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/001_btrfs/test-create.yml (100%) rename test/cases/040_packages/{009_extend => 005_extend}/001_btrfs/test.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/001_btrfs/test.yml (100%) rename test/cases/040_packages/{009_extend => 005_extend}/002_xfs/Dockerfile (100%) rename test/cases/040_packages/{009_extend => 005_extend}/002_xfs/check.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/002_xfs/extend.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/002_xfs/test-create.yml (100%) rename test/cases/040_packages/{009_extend => 005_extend}/002_xfs/test.sh (100%) rename test/cases/040_packages/{009_extend => 005_extend}/002_xfs/test.yml (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/000_auto/check.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/000_auto/test.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/000_auto/test.yml (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/001_by_label/check.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/001_by_label/test.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/001_by_label/test.yml (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/002_by_name/.gitignore (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/002_by_name/check.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/002_by_name/test.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/002_by_name/test.yml.in (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/003_btrfs/check.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/003_btrfs/test.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/003_btrfs/test.yml (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/004_xfs/check.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/004_xfs/test.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/004_xfs/test.yml (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/010_multiple/check.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/010_multiple/test.sh (100%) rename test/cases/040_packages/{008_format_mount => 006_format_mount}/010_multiple/test.yml (100%) create mode 100644 test/cases/040_packages/README.md diff --git a/test/cases/040_packages/009_extend/000_ext4/Dockerfile b/test/cases/040_packages/005_extend/000_ext4/Dockerfile similarity index 100% rename from test/cases/040_packages/009_extend/000_ext4/Dockerfile rename to test/cases/040_packages/005_extend/000_ext4/Dockerfile diff --git a/test/cases/040_packages/009_extend/000_ext4/check.sh b/test/cases/040_packages/005_extend/000_ext4/check.sh similarity index 100% rename from test/cases/040_packages/009_extend/000_ext4/check.sh rename to test/cases/040_packages/005_extend/000_ext4/check.sh diff --git a/test/cases/040_packages/009_extend/000_ext4/extend.sh b/test/cases/040_packages/005_extend/000_ext4/extend.sh similarity index 100% rename from test/cases/040_packages/009_extend/000_ext4/extend.sh rename to test/cases/040_packages/005_extend/000_ext4/extend.sh diff --git a/test/cases/040_packages/009_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml similarity index 100% rename from test/cases/040_packages/009_extend/000_ext4/test-create.yml rename to test/cases/040_packages/005_extend/000_ext4/test-create.yml diff --git a/test/cases/040_packages/009_extend/000_ext4/test.sh b/test/cases/040_packages/005_extend/000_ext4/test.sh similarity index 100% rename from test/cases/040_packages/009_extend/000_ext4/test.sh rename to test/cases/040_packages/005_extend/000_ext4/test.sh diff --git a/test/cases/040_packages/009_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml similarity index 100% rename from test/cases/040_packages/009_extend/000_ext4/test.yml rename to test/cases/040_packages/005_extend/000_ext4/test.yml diff --git a/test/cases/040_packages/009_extend/001_btrfs/Dockerfile b/test/cases/040_packages/005_extend/001_btrfs/Dockerfile similarity index 100% rename from test/cases/040_packages/009_extend/001_btrfs/Dockerfile rename to test/cases/040_packages/005_extend/001_btrfs/Dockerfile diff --git a/test/cases/040_packages/009_extend/001_btrfs/check.sh b/test/cases/040_packages/005_extend/001_btrfs/check.sh similarity index 100% rename from test/cases/040_packages/009_extend/001_btrfs/check.sh rename to test/cases/040_packages/005_extend/001_btrfs/check.sh diff --git a/test/cases/040_packages/009_extend/001_btrfs/extend.sh b/test/cases/040_packages/005_extend/001_btrfs/extend.sh similarity index 100% rename from test/cases/040_packages/009_extend/001_btrfs/extend.sh rename to test/cases/040_packages/005_extend/001_btrfs/extend.sh diff --git a/test/cases/040_packages/009_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml similarity index 100% rename from test/cases/040_packages/009_extend/001_btrfs/test-create.yml rename to test/cases/040_packages/005_extend/001_btrfs/test-create.yml diff --git a/test/cases/040_packages/009_extend/001_btrfs/test.sh b/test/cases/040_packages/005_extend/001_btrfs/test.sh similarity index 100% rename from test/cases/040_packages/009_extend/001_btrfs/test.sh rename to test/cases/040_packages/005_extend/001_btrfs/test.sh diff --git a/test/cases/040_packages/009_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml similarity index 100% rename from test/cases/040_packages/009_extend/001_btrfs/test.yml rename to test/cases/040_packages/005_extend/001_btrfs/test.yml diff --git a/test/cases/040_packages/009_extend/002_xfs/Dockerfile b/test/cases/040_packages/005_extend/002_xfs/Dockerfile similarity index 100% rename from test/cases/040_packages/009_extend/002_xfs/Dockerfile rename to test/cases/040_packages/005_extend/002_xfs/Dockerfile diff --git a/test/cases/040_packages/009_extend/002_xfs/check.sh b/test/cases/040_packages/005_extend/002_xfs/check.sh similarity index 100% rename from test/cases/040_packages/009_extend/002_xfs/check.sh rename to test/cases/040_packages/005_extend/002_xfs/check.sh diff --git a/test/cases/040_packages/009_extend/002_xfs/extend.sh b/test/cases/040_packages/005_extend/002_xfs/extend.sh similarity index 100% rename from test/cases/040_packages/009_extend/002_xfs/extend.sh rename to test/cases/040_packages/005_extend/002_xfs/extend.sh diff --git a/test/cases/040_packages/009_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml similarity index 100% rename from test/cases/040_packages/009_extend/002_xfs/test-create.yml rename to test/cases/040_packages/005_extend/002_xfs/test-create.yml diff --git a/test/cases/040_packages/009_extend/002_xfs/test.sh b/test/cases/040_packages/005_extend/002_xfs/test.sh similarity index 100% rename from test/cases/040_packages/009_extend/002_xfs/test.sh rename to test/cases/040_packages/005_extend/002_xfs/test.sh diff --git a/test/cases/040_packages/009_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml similarity index 100% rename from test/cases/040_packages/009_extend/002_xfs/test.yml rename to test/cases/040_packages/005_extend/002_xfs/test.yml diff --git a/test/cases/040_packages/008_format_mount/000_auto/check.sh b/test/cases/040_packages/006_format_mount/000_auto/check.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/000_auto/check.sh rename to test/cases/040_packages/006_format_mount/000_auto/check.sh diff --git a/test/cases/040_packages/008_format_mount/000_auto/test.sh b/test/cases/040_packages/006_format_mount/000_auto/test.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/000_auto/test.sh rename to test/cases/040_packages/006_format_mount/000_auto/test.sh diff --git a/test/cases/040_packages/008_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml similarity index 100% rename from test/cases/040_packages/008_format_mount/000_auto/test.yml rename to test/cases/040_packages/006_format_mount/000_auto/test.yml diff --git a/test/cases/040_packages/008_format_mount/001_by_label/check.sh b/test/cases/040_packages/006_format_mount/001_by_label/check.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/001_by_label/check.sh rename to test/cases/040_packages/006_format_mount/001_by_label/check.sh diff --git a/test/cases/040_packages/008_format_mount/001_by_label/test.sh b/test/cases/040_packages/006_format_mount/001_by_label/test.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/001_by_label/test.sh rename to test/cases/040_packages/006_format_mount/001_by_label/test.sh diff --git a/test/cases/040_packages/008_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml similarity index 100% rename from test/cases/040_packages/008_format_mount/001_by_label/test.yml rename to test/cases/040_packages/006_format_mount/001_by_label/test.yml diff --git a/test/cases/040_packages/008_format_mount/002_by_name/.gitignore b/test/cases/040_packages/006_format_mount/002_by_name/.gitignore similarity index 100% rename from test/cases/040_packages/008_format_mount/002_by_name/.gitignore rename to test/cases/040_packages/006_format_mount/002_by_name/.gitignore diff --git a/test/cases/040_packages/008_format_mount/002_by_name/check.sh b/test/cases/040_packages/006_format_mount/002_by_name/check.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/002_by_name/check.sh rename to test/cases/040_packages/006_format_mount/002_by_name/check.sh diff --git a/test/cases/040_packages/008_format_mount/002_by_name/test.sh b/test/cases/040_packages/006_format_mount/002_by_name/test.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/002_by_name/test.sh rename to test/cases/040_packages/006_format_mount/002_by_name/test.sh diff --git a/test/cases/040_packages/008_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in similarity index 100% rename from test/cases/040_packages/008_format_mount/002_by_name/test.yml.in rename to test/cases/040_packages/006_format_mount/002_by_name/test.yml.in diff --git a/test/cases/040_packages/008_format_mount/003_btrfs/check.sh b/test/cases/040_packages/006_format_mount/003_btrfs/check.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/003_btrfs/check.sh rename to test/cases/040_packages/006_format_mount/003_btrfs/check.sh diff --git a/test/cases/040_packages/008_format_mount/003_btrfs/test.sh b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/003_btrfs/test.sh rename to test/cases/040_packages/006_format_mount/003_btrfs/test.sh diff --git a/test/cases/040_packages/008_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml similarity index 100% rename from test/cases/040_packages/008_format_mount/003_btrfs/test.yml rename to test/cases/040_packages/006_format_mount/003_btrfs/test.yml diff --git a/test/cases/040_packages/008_format_mount/004_xfs/check.sh b/test/cases/040_packages/006_format_mount/004_xfs/check.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/004_xfs/check.sh rename to test/cases/040_packages/006_format_mount/004_xfs/check.sh diff --git a/test/cases/040_packages/008_format_mount/004_xfs/test.sh b/test/cases/040_packages/006_format_mount/004_xfs/test.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/004_xfs/test.sh rename to test/cases/040_packages/006_format_mount/004_xfs/test.sh diff --git a/test/cases/040_packages/008_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml similarity index 100% rename from test/cases/040_packages/008_format_mount/004_xfs/test.yml rename to test/cases/040_packages/006_format_mount/004_xfs/test.yml diff --git a/test/cases/040_packages/008_format_mount/010_multiple/check.sh b/test/cases/040_packages/006_format_mount/010_multiple/check.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/010_multiple/check.sh rename to test/cases/040_packages/006_format_mount/010_multiple/check.sh diff --git a/test/cases/040_packages/008_format_mount/010_multiple/test.sh b/test/cases/040_packages/006_format_mount/010_multiple/test.sh similarity index 100% rename from test/cases/040_packages/008_format_mount/010_multiple/test.sh rename to test/cases/040_packages/006_format_mount/010_multiple/test.sh diff --git a/test/cases/040_packages/008_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml similarity index 100% rename from test/cases/040_packages/008_format_mount/010_multiple/test.yml rename to test/cases/040_packages/006_format_mount/010_multiple/test.yml diff --git a/test/cases/040_packages/README.md b/test/cases/040_packages/README.md new file mode 100644 index 000000000..e08ed3523 --- /dev/null +++ b/test/cases/040_packages/README.md @@ -0,0 +1,3 @@ +NOTE: The cases in this directory are ordered alphabetically. +The index used is the position of the first letter of the name in the alphabet. +For example, 001_a, 002_b, 003_c etc... From e17a12219a8826500f0afceca1afaf780e93275a Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Tue, 8 Aug 2017 12:33:42 +0100 Subject: [PATCH 2/3] tests: Remove docker dependency from extend tests This commit removes the dependency on Docker by using raw disks and appending from /dev/zero to extend them once initially formatted. Additionally, the tests now use unique ${NAME} variables Signed-off-by: Dave Tucker --- .../040_packages/005_extend/000_ext4/Dockerfile | 2 -- .../cases/040_packages/005_extend/000_ext4/extend.sh | 3 --- test/cases/040_packages/005_extend/000_ext4/test.sh | 12 +++++------- .../040_packages/005_extend/001_btrfs/Dockerfile | 2 -- .../040_packages/005_extend/001_btrfs/extend.sh | 3 --- test/cases/040_packages/005_extend/001_btrfs/test.sh | 12 +++++------- .../cases/040_packages/005_extend/002_xfs/Dockerfile | 2 -- test/cases/040_packages/005_extend/002_xfs/check.sh | 2 +- test/cases/040_packages/005_extend/002_xfs/extend.sh | 3 --- test/cases/040_packages/005_extend/002_xfs/test.sh | 12 +++++------- 10 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 test/cases/040_packages/005_extend/000_ext4/Dockerfile delete mode 100755 test/cases/040_packages/005_extend/000_ext4/extend.sh delete mode 100644 test/cases/040_packages/005_extend/001_btrfs/Dockerfile delete mode 100755 test/cases/040_packages/005_extend/001_btrfs/extend.sh delete mode 100644 test/cases/040_packages/005_extend/002_xfs/Dockerfile delete mode 100755 test/cases/040_packages/005_extend/002_xfs/extend.sh diff --git a/test/cases/040_packages/005_extend/000_ext4/Dockerfile b/test/cases/040_packages/005_extend/000_ext4/Dockerfile deleted file mode 100644 index 7d65b7bf1..000000000 --- a/test/cases/040_packages/005_extend/000_ext4/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM alpine:3.6 -RUN apk add --no-cache qemu-img sfdisk e2fsprogs util-linux diff --git a/test/cases/040_packages/005_extend/000_ext4/extend.sh b/test/cases/040_packages/005_extend/000_ext4/extend.sh deleted file mode 100755 index f7f9e5788..000000000 --- a/test/cases/040_packages/005_extend/000_ext4/extend.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -ex -qemu-img resize -f qcow2 "$1" +256M diff --git a/test/cases/040_packages/005_extend/000_ext4/test.sh b/test/cases/040_packages/005_extend/000_ext4/test.sh index 91b8e86a2..725b5c84b 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.sh +++ b/test/cases/040_packages/005_extend/000_ext4/test.sh @@ -9,24 +9,22 @@ set -ex #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" -NAME=test-extend +NAME=test-extend-ext4 DISK=disk0.img clean_up() { find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf "create*" || true rm -rf ${DISK} || true - docker rmi ${NAME} || true } trap clean_up EXIT # Test code goes here -rm -rf ${DISK} || true -docker build -t ${NAME} . moby build --name create -output kernel+initrd test-create.yml -linuxkit run -disk file=${DISK},size=256M create -rm -rf "create*" +linuxkit run -disk file=${DISK},format=raw,size=256M create [ -f ${DISK} ] || exit 1 -docker run -i --rm --privileged -v "$PWD:/tmp" -w /tmp ${NAME} ./extend.sh ${DISK} +# osx takes issue with bs=1M +dd if=/dev/zero bs=1048576 count=256 >> ${DISK} moby build -name ${NAME} -output kernel+initrd test.yml RESULT="$(linuxkit run -disk file=${DISK} ${NAME})" echo "${RESULT}" diff --git a/test/cases/040_packages/005_extend/001_btrfs/Dockerfile b/test/cases/040_packages/005_extend/001_btrfs/Dockerfile deleted file mode 100644 index 7d65b7bf1..000000000 --- a/test/cases/040_packages/005_extend/001_btrfs/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM alpine:3.6 -RUN apk add --no-cache qemu-img sfdisk e2fsprogs util-linux diff --git a/test/cases/040_packages/005_extend/001_btrfs/extend.sh b/test/cases/040_packages/005_extend/001_btrfs/extend.sh deleted file mode 100755 index f7f9e5788..000000000 --- a/test/cases/040_packages/005_extend/001_btrfs/extend.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -ex -qemu-img resize -f qcow2 "$1" +256M diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.sh b/test/cases/040_packages/005_extend/001_btrfs/test.sh index 9649bc8f6..6bd095676 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.sh +++ b/test/cases/040_packages/005_extend/001_btrfs/test.sh @@ -9,24 +9,22 @@ set -ex #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" -NAME=test-extend +NAME=test-extend-btrfs DISK=disk0.img clean_up() { find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf "create*" || true rm -rf ${DISK} || true - docker rmi ${NAME} || true } trap clean_up EXIT # Test code goes here -rm -rf disk0.img || true -docker build -t ${NAME} . moby build --name create -output kernel+initrd test-create.yml -linuxkit run -disk file=${DISK},size=256M create -rm -rf "create*" +linuxkit run -disk file=${DISK},format=raw,size=256M create [ -f ${DISK} ] || exit 1 -docker run -i --rm --privileged -v "$PWD:/tmp" -w /tmp ${NAME} ./extend.sh ${DISK} +# osx takes issue with bs=1M +dd if=/dev/zero bs=1048576 count=256 >> ${DISK} moby build -name ${NAME} -output kernel+initrd test.yml RESULT="$(linuxkit run -disk file=${DISK} ${NAME})" echo "${RESULT}" diff --git a/test/cases/040_packages/005_extend/002_xfs/Dockerfile b/test/cases/040_packages/005_extend/002_xfs/Dockerfile deleted file mode 100644 index 7d65b7bf1..000000000 --- a/test/cases/040_packages/005_extend/002_xfs/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM alpine:3.6 -RUN apk add --no-cache qemu-img sfdisk e2fsprogs util-linux diff --git a/test/cases/040_packages/005_extend/002_xfs/check.sh b/test/cases/040_packages/005_extend/002_xfs/check.sh index 4523db10d..943fabc04 100755 --- a/test/cases/040_packages/005_extend/002_xfs/check.sh +++ b/test/cases/040_packages/005_extend/002_xfs/check.sh @@ -9,5 +9,5 @@ function failed { [ -f /var/lib/docker/bar ] || failed touch /var/lib/docker/foo || failed -df -h | grep -q "507.7M" || failed +df -h | grep -q "504.8M" || failed printf "extend test suite PASSED\n" >&1 diff --git a/test/cases/040_packages/005_extend/002_xfs/extend.sh b/test/cases/040_packages/005_extend/002_xfs/extend.sh deleted file mode 100755 index f7f9e5788..000000000 --- a/test/cases/040_packages/005_extend/002_xfs/extend.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -ex -qemu-img resize -f qcow2 "$1" +256M diff --git a/test/cases/040_packages/005_extend/002_xfs/test.sh b/test/cases/040_packages/005_extend/002_xfs/test.sh index cc05a834f..7c264b410 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.sh +++ b/test/cases/040_packages/005_extend/002_xfs/test.sh @@ -9,24 +9,22 @@ set -ex #. "${RT_LIB}" . "${RT_PROJECT_ROOT}/_lib/lib.sh" -NAME=test-extend +NAME=test-extend-xfs DISK=disk0.img clean_up() { find . -depth -iname "${NAME}*" -not -iname "*.yml" -exec rm -rf {} \; + rm -rf "create*" || true rm -rf ${DISK} || true - docker rmi ${NAME} || true } trap clean_up EXIT # Test code goes here -rm -rf disk0.img || true -docker build -t ${NAME} . moby build --name create -output kernel+initrd test-create.yml -linuxkit run -disk file=${DISK},size=256M create -rm -rf "create*" +linuxkit run -disk file=${DISK},format=raw,size=256M create [ -f ${DISK} ] || exit 1 -docker run -i --rm --privileged -v "$PWD:/tmp" -w /tmp ${NAME} ./extend.sh ${DISK} +# osx takes issue with bs=1M +dd if=/dev/zero bs=1048576 count=256 >> ${DISK} moby build -name ${NAME} -output kernel+initrd test.yml RESULT="$(linuxkit run -disk file=${DISK} ${NAME})" echo "${RESULT}" From 6aed51ca5c14fbdc079c4cdc237a98e1c4386fac Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Tue, 8 Aug 2017 13:47:32 +0100 Subject: [PATCH 3/3] tests: Remove hardcoded sizes from extend tests In order to update these tests it required first running df -h to obtain the new disk size and then adding that value to check.sh This commit replaces the hardcoded values with a regex that checks that the filesystem is somewhere between 400-599MB in size. Before being extended this would have been somewhere in the region of 200-300MB. Signed-off-by: Dave Tucker --- test/cases/040_packages/005_extend/000_ext4/check.sh | 2 +- test/cases/040_packages/005_extend/001_btrfs/check.sh | 2 +- test/cases/040_packages/005_extend/002_xfs/check.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/cases/040_packages/005_extend/000_ext4/check.sh b/test/cases/040_packages/005_extend/000_ext4/check.sh index c14eef3c5..04b9466da 100755 --- a/test/cases/040_packages/005_extend/000_ext4/check.sh +++ b/test/cases/040_packages/005_extend/000_ext4/check.sh @@ -9,5 +9,5 @@ function failed { [ -f /var/lib/docker/bar ] || failed touch /var/lib/docker/foo || failed -df -h | grep -q "490.9M" || failed +df -h | grep -qE "[4-5][0-9]{2}\.[0-9]{1,}M" || failed printf "extend test suite PASSED\n" >&1 diff --git a/test/cases/040_packages/005_extend/001_btrfs/check.sh b/test/cases/040_packages/005_extend/001_btrfs/check.sh index 905634e7d..04b9466da 100755 --- a/test/cases/040_packages/005_extend/001_btrfs/check.sh +++ b/test/cases/040_packages/005_extend/001_btrfs/check.sh @@ -9,5 +9,5 @@ function failed { [ -f /var/lib/docker/bar ] || failed touch /var/lib/docker/foo || failed -df -h | grep -q "511.0M" || failed +df -h | grep -qE "[4-5][0-9]{2}\.[0-9]{1,}M" || failed printf "extend test suite PASSED\n" >&1 diff --git a/test/cases/040_packages/005_extend/002_xfs/check.sh b/test/cases/040_packages/005_extend/002_xfs/check.sh index 943fabc04..04b9466da 100755 --- a/test/cases/040_packages/005_extend/002_xfs/check.sh +++ b/test/cases/040_packages/005_extend/002_xfs/check.sh @@ -9,5 +9,5 @@ function failed { [ -f /var/lib/docker/bar ] || failed touch /var/lib/docker/foo || failed -df -h | grep -q "504.8M" || failed +df -h | grep -qE "[4-5][0-9]{2}\.[0-9]{1,}M" || failed printf "extend test suite PASSED\n" >&1