tests: don't run some mount tests for non-root users

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/functions.sh b/tests/functions.sh
index b2e17f3ca48e30cf1c1cc42ddcc913378a758c96..d07b7e314737773787bbbbfd23df357d55ee4b10 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -153,7 +153,7 @@ function ts_init_subtest {
        [ $TS_NSUBTESTS -eq 0 ] && echo
        TS_NSUBTESTS=$(( $TS_NSUBTESTS + 1 ))
 
-       printf "%18s: %-27s ..." "" "$TS_SUBNAME"
+       printf "%16s: %-27s ..." "" "$TS_SUBNAME"
 }
 
 function ts_init {
@@ -161,7 +161,7 @@ function ts_init {
 
        ts_init_env "$*"
 
-       printf "%15s: %-30s ..." "$TS_COMPONENT" "$TS_DESC"
+       printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_DESC"
 
        [ "$is_fake" == "yes" ] && ts_skip "fake mode"
 }
@@ -218,7 +218,7 @@ function ts_finalize {
        done
 
        if [ $TS_NSUBTESTS -ne 0 ]; then
-               printf "%13s..."
+               printf "%11s..."
                if [ $TS_NSUBFAILED -ne 0 ]; then
                        ts_failed "$TS_NSUBFAILED from $TS_NSUBTESTS sub-tests"
                else

diff --git a/tests/ts/mount/noncanonical b/tests/ts/mount/noncanonical
index d9be68bebc3192755fd8a9473e77652611e32da5..31149923476fe31accce83721744d92168e67b92 100755 (executable)
--- a/tests/ts/mount/noncanonical
+++ b/tests/ts/mount/noncanonical
@@ -20,6 +20,7 @@ TS_DESC="non canonical path"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+ts_skip_nonroot
 
 [ ! -e "/etc" ] && ts_skip "/etc not such file of directory"
 

diff --git a/tests/ts/mount/paths b/tests/ts/mount/paths
index 93b44ae9712c7d4f97f5855e355a9dd84390a044..bb2cabf34ad45ec69cf4e4488e7969a8388e7671 100755 (executable)
--- a/tests/ts/mount/paths
+++ b/tests/ts/mount/paths
@@ -20,6 +20,7 @@ TS_DESC="basic paths"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+ts_skip_nonroot
 
 $TS_CMD_MOUNT -n -f -v -v -v /dev/dummy /mnt &> $TS_OUTPUT