From 58d61d084621a905bccc501d40ce266d6adddf4c Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 13 Jun 2017 17:13:15 +0100 Subject: [PATCH] tests: traverse directories before removing them during cleanup Without `-depth` find will first `rm -rf foo` and then try to recurse into `foo` resulting in `No such file or directory`. With this the various `|| true` suffixes should no longer be required. Lastly, in test/cases/040_packages/013_mkimage/test.sh cleanup any `disk.qcow2*` detritus as well as the image itself. Signed-off-by: Ian Campbell --- test/cases/000_build/000_outputs/test.sh | 2 +- test/cases/020_kernel/000_config_4.4.x/test.sh | 2 +- test/cases/020_kernel/001_config_4.9.x/test.sh | 2 +- test/cases/020_kernel/003_config_4.11.x/test.sh | 2 +- test/cases/020_kernel/010_kmod_4.9.x/test.sh | 2 +- test/cases/040_packages/002_binfmt/test.sh | 2 +- test/cases/040_packages/003_ca-certificates/test.sh | 2 +- test/cases/040_packages/004_dhcpcd/test.sh | 2 +- test/cases/040_packages/013_mkimage/test.sh | 7 ++++--- test/cases/040_packages/019_sysctl/test.sh | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/test/cases/000_build/000_outputs/test.sh b/test/cases/000_build/000_outputs/test.sh index aab7ae5d5..3c7058520 100644 --- a/test/cases/000_build/000_outputs/test.sh +++ b/test/cases/000_build/000_outputs/test.sh @@ -12,7 +12,7 @@ NAME=check clean_up() { # remove any images - find . -iname "${NAME}*" -exec rm {} \; + find . -depth -iname "${NAME}*" -exec rm -rf {} \; } trap clean_up EXIT diff --git a/test/cases/020_kernel/000_config_4.4.x/test.sh b/test/cases/020_kernel/000_config_4.4.x/test.sh index 2ecd67ed8..4200bd918 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.sh +++ b/test/cases/020_kernel/000_config_4.4.x/test.sh @@ -10,7 +10,7 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; || true + find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; } trap clean_up EXIT diff --git a/test/cases/020_kernel/001_config_4.9.x/test.sh b/test/cases/020_kernel/001_config_4.9.x/test.sh index 2ecd67ed8..4200bd918 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.sh +++ b/test/cases/020_kernel/001_config_4.9.x/test.sh @@ -10,7 +10,7 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; || true + find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; } trap clean_up EXIT diff --git a/test/cases/020_kernel/003_config_4.11.x/test.sh b/test/cases/020_kernel/003_config_4.11.x/test.sh index 2ecd67ed8..4200bd918 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test.sh +++ b/test/cases/020_kernel/003_config_4.11.x/test.sh @@ -10,7 +10,7 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; || true + find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; } trap clean_up EXIT diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.sh b/test/cases/020_kernel/010_kmod_4.9.x/test.sh index 9a08df964..8a1e8034d 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.sh +++ b/test/cases/020_kernel/010_kmod_4.9.x/test.sh @@ -13,7 +13,7 @@ IMAGE_NAME="kmod-test" clean_up() { docker rmi ${IMAGE_NAME} || true - find . -iname "kmod*" -not -iname "*.yml" -exec rm -rf {} \; || true + find . -depth -iname "kmod*" -not -iname "*.yml" -exec rm -rf {} \; } trap clean_up EXIT diff --git a/test/cases/040_packages/002_binfmt/test.sh b/test/cases/040_packages/002_binfmt/test.sh index 7cd5cc0e0..7403afe26 100644 --- a/test/cases/040_packages/002_binfmt/test.sh +++ b/test/cases/040_packages/002_binfmt/test.sh @@ -10,7 +10,7 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-binfmt*" -not -iname "*.yml" -exec rm -rf {} \; || true + find . -depth -iname "test-binfmt*" -not -iname "*.yml" -exec rm -rf {} \; } trap clean_up EXIT diff --git a/test/cases/040_packages/003_ca-certificates/test.sh b/test/cases/040_packages/003_ca-certificates/test.sh index 6ba5bebf7..9e2c98164 100644 --- a/test/cases/040_packages/003_ca-certificates/test.sh +++ b/test/cases/040_packages/003_ca-certificates/test.sh @@ -10,7 +10,7 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-ca-certificates*" -not -iname "*.yml" -exec rm -rf {} \; || true + find . -depth -iname "test-ca-certificates*" -not -iname "*.yml" -exec rm -rf {} \; } trap clean_up EXIT diff --git a/test/cases/040_packages/004_dhcpcd/test.sh b/test/cases/040_packages/004_dhcpcd/test.sh index ac1d42816..9290fd141 100644 --- a/test/cases/040_packages/004_dhcpcd/test.sh +++ b/test/cases/040_packages/004_dhcpcd/test.sh @@ -10,7 +10,7 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-dhcpcd*" -not -iname "*.yml" -exec rm -rf {} \; || true + find . -depth -iname "test-dhcpcd*" -not -iname "*.yml" -exec rm -rf {} \; } trap clean_up EXIT diff --git a/test/cases/040_packages/013_mkimage/test.sh b/test/cases/040_packages/013_mkimage/test.sh index 80939d923..0e1c8d6c7 100644 --- a/test/cases/040_packages/013_mkimage/test.sh +++ b/test/cases/040_packages/013_mkimage/test.sh @@ -10,9 +10,10 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "run*" -not -iname "*.yml" -exec rm -rf {} \; - find . -iname "mkimage*" -not -iname "*.yml" -exec rm -rf {} \; - rm -f disk.qcow2 tarball.img + find . -depth -iname "run*" -not -iname "*.yml" -exec rm -rf {} \; + find . -depth -iname "mkimage*" -not -iname "*.yml" -exec rm -rf {} \; + find . -depth -iname "disk.qcow2*" -not -iname "*.yml" -exec rm -rf {} \; + rm -f tarball.img } trap clean_up EXIT diff --git a/test/cases/040_packages/019_sysctl/test.sh b/test/cases/040_packages/019_sysctl/test.sh index 47e652a9c..99358c4b5 100644 --- a/test/cases/040_packages/019_sysctl/test.sh +++ b/test/cases/040_packages/019_sysctl/test.sh @@ -10,7 +10,7 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-sysctl*" -not -iname "*.yml" -exec rm -rf {} \; || true + find . -depth -iname "test-sysctl*" -not -iname "*.yml" -exec rm -rf {} \; } trap clean_up EXIT