From 6aed51ca5c14fbdc079c4cdc237a98e1c4386fac Mon Sep 17 00:00:00 2001
From: Dave Tucker
Date: Tue, 8 Aug 2017 13:47:32 +0100
Subject: [PATCH] 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