summaryrefslogtreecommitdiffstats
path: root/tests/ts/mount
diff options
context:
space:
mode:
authorRuediger Meier2015-04-21 10:41:01 +0200
committerRuediger Meier2015-04-21 14:58:30 +0200
commitfffe5f7c72121c054645c60c0bb49f653bb7142e (patch)
treeffe8d9702ce1cc879d2a1d79ec08cc52e40d93f5 /tests/ts/mount
parenttests: loop tests, don't call ts_die() with DEVICE parameter (diff)
downloadkernel-qcow2-util-linux-fffe5f7c72121c054645c60c0bb49f653bb7142e.tar.gz
kernel-qcow2-util-linux-fffe5f7c72121c054645c60c0bb49f653bb7142e.tar.xz
kernel-qcow2-util-linux-fffe5f7c72121c054645c60c0bb49f653bb7142e.zip
tests: never use -o pipefail
It was hard to find out that pipefail was the reason why our test-suite could have random failures for aribtrary tests, for example the ones which are using ts_device_has_uuid() or ts_mount(). Bash's pipefall option is evil! It may return error for such a simple line like this one $ echo -e "xxx\nyyy" | grep -q "xxx" because the left echo command will get SIGPIPE when grep exits after the first match. So the command line above could return an error eventhough it does exactly what we want. This patch removes any pipefail from our tests. The funny thing is that I couldn't find any case where we relied on this feature anyway. Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/mount')
-rwxr-xr-xtests/ts/mount/devname2
-rwxr-xr-xtests/ts/mount/fslists2
-rwxr-xr-xtests/ts/mount/fstab-broken2
-rwxr-xr-xtests/ts/mount/fstab-devname2
-rwxr-xr-xtests/ts/mount/fstab-devname2label2
-rwxr-xr-xtests/ts/mount/fstab-devname2uuid2
-rwxr-xr-xtests/ts/mount/fstab-label2
-rwxr-xr-xtests/ts/mount/fstab-label2devname2
-rwxr-xr-xtests/ts/mount/fstab-label2uuid2
-rwxr-xr-xtests/ts/mount/fstab-none2
-rwxr-xr-xtests/ts/mount/fstab-symlink2
-rwxr-xr-xtests/ts/mount/fstab-uuid2
-rwxr-xr-xtests/ts/mount/fstab-uuid2devname2
-rwxr-xr-xtests/ts/mount/fstab-uuid2label2
-rwxr-xr-xtests/ts/mount/label2
-rwxr-xr-xtests/ts/mount/regfile2
-rwxr-xr-xtests/ts/mount/rlimit2
-rwxr-xr-xtests/ts/mount/uuid2
18 files changed, 0 insertions, 36 deletions
diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index f4bfebd0f..2ba5effb6 100755
--- a/tests/ts/mount/devname
+++ b/tests/ts/mount/devname
@@ -29,8 +29,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists
index 28bba6c48..599173002 100755
--- a/tests/ts/mount/fslists
+++ b/tests/ts/mount/fslists
@@ -29,8 +29,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
index 57d5d2d4f..f67d35cb1 100755
--- a/tests/ts/mount/fstab-broken
+++ b/tests/ts/mount/fstab-broken
@@ -27,8 +27,6 @@ ts_check_test_command "$TS_CMD_FINDMNT"
ts_skip_nonroot
-set -o pipefail
-
# Let's use the same mountpoint for all subtests
MNT=$TS_MOUNTPOINT
mkdir -p $MNT
diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index a80934330..05704969b 100755
--- a/tests/ts/mount/fstab-devname
+++ b/tests/ts/mount/fstab-devname
@@ -28,8 +28,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
index 8519b498c..f55d2056b 100755
--- a/tests/ts/mount/fstab-devname2label
+++ b/tests/ts/mount/fstab-devname2label
@@ -29,8 +29,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
index 31bb3d053..66d9046dc 100755
--- a/tests/ts/mount/fstab-devname2uuid
+++ b/tests/ts/mount/fstab-devname2uuid
@@ -28,8 +28,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index 2c925fb09..e0d819b9a 100755
--- a/tests/ts/mount/fstab-label
+++ b/tests/ts/mount/fstab-label
@@ -29,8 +29,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index 4cb34d764..6bb23a5f9 100755
--- a/tests/ts/mount/fstab-label2devname
+++ b/tests/ts/mount/fstab-label2devname
@@ -29,8 +29,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index a02ba41f8..08a2927bf 100755
--- a/tests/ts/mount/fstab-label2uuid
+++ b/tests/ts/mount/fstab-label2uuid
@@ -30,8 +30,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none
index 082afe905..b90008f00 100755
--- a/tests/ts/mount/fstab-none
+++ b/tests/ts/mount/fstab-none
@@ -12,8 +12,6 @@ ts_check_test_command "$TS_CMD_FINDMNT"
ts_skip_nonroot
-set -o pipefail
-
ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime"
mkdir -p $TS_MOUNTPOINT
diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
index 2579c85af..bf00e1355 100755
--- a/tests/ts/mount/fstab-symlink
+++ b/tests/ts/mount/fstab-symlink
@@ -29,8 +29,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
LINKNAME="$TS_OUTDIR/${TS_TESTNAME}_lnk"
ts_device_init
diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index e3bb1e7f5..6d7c5bf3c 100755
--- a/tests/ts/mount/fstab-uuid
+++ b/tests/ts/mount/fstab-uuid
@@ -28,8 +28,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index ac0b932e3..6c9009720 100755
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/tests/ts/mount/fstab-uuid2devname
@@ -28,8 +28,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index edcdc0c53..77895e31c 100755
--- a/tests/ts/mount/fstab-uuid2label
+++ b/tests/ts/mount/fstab-uuid2label
@@ -29,8 +29,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index 2becdb589..5e935c032 100755
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -30,8 +30,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV
diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile
index fd908356d..8278e84b1 100755
--- a/tests/ts/mount/regfile
+++ b/tests/ts/mount/regfile
@@ -16,8 +16,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
IMAGE=$(ts_image_init)
mkfs.ext3 -F $IMAGE &> /dev/null || ts_die "Cannot make ext3 on $IMAGE"
diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit
index 223f717dd..5e6880c4f 100755
--- a/tests/ts/mount/rlimit
+++ b/tests/ts/mount/rlimit
@@ -39,8 +39,6 @@ ts_check_losetup
[ -L /etc/mtab ] && ts_skip "mtab is symlink"
[ "$(stat --format '%s' /etc/mtab)" -gt "1024" ] || ts_skip "mtab is too small"
-set -o pipefail
-
function mtab_checksum()
{
md5sum /etc/mtab | awk '{printf $1}'
diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index 4dec89a79..6af358c7d 100755
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -28,8 +28,6 @@ ts_check_prog "mkfs.ext3"
ts_skip_nonroot
ts_check_losetup
-set -o pipefail
-
ts_device_init
DEVICE=$TS_LODEV