From 6842f10351cfc4f0898a91e461cba4a02e76cedd Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Sun, 17 Sep 2017 16:20:19 +0100
Subject: [PATCH] tests: Clean up build tests

Build tests don't need the 'find' nor 'rm -r' as they don't
create directories.

There is no need to delete the 'test.yml' file in
the output tests.

Consistently use NAME as the name argument

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 test/cases/000_build/000_outputs/000_kernel+initrd/test.sh | 4 +---
 test/cases/000_build/000_outputs/001_iso-bios/test.sh      | 4 +---
 test/cases/000_build/000_outputs/002_iso-efi/test.sh       | 6 ++----
 test/cases/000_build/000_outputs/003_gcp/test.sh           | 4 +---
 test/cases/000_build/000_outputs/004_raw/test.sh           | 4 +---
 test/cases/000_build/000_outputs/005_qcow2/test.sh         | 4 +---
 test/cases/000_build/000_outputs/006_vhd/test.sh           | 4 +---
 test/cases/000_build/000_outputs/007_vmdk/test.sh          | 4 +---
 test/cases/000_build/100_examples/000_minimal/test.sh      | 7 +++----
 test/cases/000_build/100_examples/010_docker/test.sh       | 7 +++----
 test/cases/000_build/100_examples/020_sshd/test.sh         | 7 +++----
 test/cases/000_build/100_examples/030_redis/test.sh        | 7 +++----
 test/cases/000_build/100_examples/040_swap/test.sh         | 7 +++----
 .../cases/000_build/100_examples/050_node_exporter/test.sh | 7 +++----
 test/cases/000_build/100_examples/060_tpm/test.sh          | 7 +++----
 test/cases/000_build/100_examples/070_wireguard/test.sh    | 7 +++----
 .../000_build/200_blueprints/010_docker_for_mac/test.sh    | 7 +++----
 17 files changed, 36 insertions(+), 61 deletions(-)

diff --git a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh b/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh
index 14479883a..a1e9c3cdc 100644
--- a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh
+++ b/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh
@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
diff --git a/test/cases/000_build/000_outputs/001_iso-bios/test.sh b/test/cases/000_build/000_outputs/001_iso-bios/test.sh
index e25ef03b0..e824f626c 100644
--- a/test/cases/000_build/000_outputs/001_iso-bios/test.sh
+++ b/test/cases/000_build/000_outputs/001_iso-bios/test.sh
@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
diff --git a/test/cases/000_build/000_outputs/002_iso-efi/test.sh b/test/cases/000_build/000_outputs/002_iso-efi/test.sh
index b56f40515..e710b7c87 100644
--- a/test/cases/000_build/000_outputs/002_iso-efi/test.sh
+++ b/test/cases/000_build/000_outputs/002_iso-efi/test.sh
@@ -11,14 +11,12 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 moby build -format iso-efi -name "${NAME}" ../test.yml
-[ -f "${NAME}-efi.iso" ] || exit 1
+[ -f "${NAME}"-efi.iso ] || exit 1
 
 exit 0
diff --git a/test/cases/000_build/000_outputs/003_gcp/test.sh b/test/cases/000_build/000_outputs/003_gcp/test.sh
index 8a92fa218..8eb53b3b5 100644
--- a/test/cases/000_build/000_outputs/003_gcp/test.sh
+++ b/test/cases/000_build/000_outputs/003_gcp/test.sh
@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
diff --git a/test/cases/000_build/000_outputs/004_raw/test.sh b/test/cases/000_build/000_outputs/004_raw/test.sh
index c786679c8..bd1ac9c13 100644
--- a/test/cases/000_build/000_outputs/004_raw/test.sh
+++ b/test/cases/000_build/000_outputs/004_raw/test.sh
@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
diff --git a/test/cases/000_build/000_outputs/005_qcow2/test.sh b/test/cases/000_build/000_outputs/005_qcow2/test.sh
index 80af3372f..edba153c2 100644
--- a/test/cases/000_build/000_outputs/005_qcow2/test.sh
+++ b/test/cases/000_build/000_outputs/005_qcow2/test.sh
@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
diff --git a/test/cases/000_build/000_outputs/006_vhd/test.sh b/test/cases/000_build/000_outputs/006_vhd/test.sh
index 983ba94c9..a94c2f52b 100644
--- a/test/cases/000_build/000_outputs/006_vhd/test.sh
+++ b/test/cases/000_build/000_outputs/006_vhd/test.sh
@@ -12,9 +12,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
diff --git a/test/cases/000_build/000_outputs/007_vmdk/test.sh b/test/cases/000_build/000_outputs/007_vmdk/test.sh
index 77d07bb2d..8a62bb2db 100644
--- a/test/cases/000_build/000_outputs/007_vmdk/test.sh
+++ b/test/cases/000_build/000_outputs/007_vmdk/test.sh
@@ -11,9 +11,7 @@ set -e
 NAME=check
 
 clean_up() {
-	# remove any images
-	find . -depth -iname "${NAME}*" -exec rm -rf {} \;
-	rm -f test.yml
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
diff --git a/test/cases/000_build/100_examples/000_minimal/test.sh b/test/cases/000_build/100_examples/000_minimal/test.sh
index 0871a8488..0c7cd9e89 100644
--- a/test/cases/000_build/100_examples/000_minimal/test.sh
+++ b/test/cases/000_build/100_examples/000_minimal/test.sh
@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=minimal
+NAME=minimal
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/010_docker/test.sh b/test/cases/000_build/100_examples/010_docker/test.sh
index 9f2bd538f..cd54b477d 100644
--- a/test/cases/000_build/100_examples/010_docker/test.sh
+++ b/test/cases/000_build/100_examples/010_docker/test.sh
@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=docker
+NAME=docker
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/020_sshd/test.sh b/test/cases/000_build/100_examples/020_sshd/test.sh
index 6b0436af3..85eaa701a 100644
--- a/test/cases/000_build/100_examples/020_sshd/test.sh
+++ b/test/cases/000_build/100_examples/020_sshd/test.sh
@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=sshd
+NAME=sshd
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/030_redis/test.sh b/test/cases/000_build/100_examples/030_redis/test.sh
index 1e36eb2cf..1732d8cd4 100644
--- a/test/cases/000_build/100_examples/030_redis/test.sh
+++ b/test/cases/000_build/100_examples/030_redis/test.sh
@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=redis-os
+NAME=redis-os
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/040_swap/test.sh b/test/cases/000_build/100_examples/040_swap/test.sh
index 06996de2e..f8abdd5e1 100644
--- a/test/cases/000_build/100_examples/040_swap/test.sh
+++ b/test/cases/000_build/100_examples/040_swap/test.sh
@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=swap
+NAME=swap
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/050_node_exporter/test.sh b/test/cases/000_build/100_examples/050_node_exporter/test.sh
index f81d1ff9e..9855817fc 100644
--- a/test/cases/000_build/100_examples/050_node_exporter/test.sh
+++ b/test/cases/000_build/100_examples/050_node_exporter/test.sh
@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=node_exporter
+NAME=node_exporter
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
 
diff --git a/test/cases/000_build/100_examples/060_tpm/test.sh b/test/cases/000_build/100_examples/060_tpm/test.sh
index dbfa40ab5..7918d6ecd 100644
--- a/test/cases/000_build/100_examples/060_tpm/test.sh
+++ b/test/cases/000_build/100_examples/060_tpm/test.sh
@@ -8,16 +8,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=tpm
+NAME=tpm
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml"
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml"
 
 exit 0
diff --git a/test/cases/000_build/100_examples/070_wireguard/test.sh b/test/cases/000_build/100_examples/070_wireguard/test.sh
index 4149a9d26..014b3d628 100644
--- a/test/cases/000_build/100_examples/070_wireguard/test.sh
+++ b/test/cases/000_build/100_examples/070_wireguard/test.sh
@@ -8,16 +8,15 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=wireguard
+NAME=wireguard
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build "${LINUXKIT_EXAMPLES_DIR}/${IMAGE_NAME}.yml" 
+moby build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" 
 
 exit 0
diff --git a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
index 892ca0fed..edc8b9c6a 100644
--- a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
+++ b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
@@ -8,17 +8,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=docker-for-mac
+NAME=docker-for-mac
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
+	rm -f ${NAME}*
 }
 
 trap clean_up EXIT
 
 # Test code goes here
-moby build -name "${IMAGE_NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/docker-ce.yml" 
+moby build -name "${NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/docker-ce.yml"
 
 exit 0