test: mark some tests as broken when run as root.

File permission errors e.g., are hard to trigger as root.

diff --git a/test/T050-new.sh b/test/T050-new.sh
index cb67889c95f82d6a4d130d65560fb453ff8d5efe..240c181064ca4bc9006262aaf776430b90f3c2d9 100755 (executable)
--- a/test/T050-new.sh
+++ b/test/T050-new.sh
@@ -384,6 +384,7 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Xapian exception: read only files"
+test_subtest_broken_for_root
 chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
 output=$(NOTMUCH_NEW --debug 2>&1 | sed 's/: .*$//' )
 chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*

diff --git a/test/T150-tagging.sh b/test/T150-tagging.sh
index 1a2fd77e4853708580293c9695a61cab0398fe8e..ac3f25399dc0e9024c8606c70805703355392ec6 100755 (executable)
--- a/test/T150-tagging.sh
+++ b/test/T150-tagging.sh
@@ -320,6 +320,7 @@ test_begin_subtest "Tag name beginning with -"
 test_expect_code 1 'notmuch tag +- One'
 
 test_begin_subtest "Xapian exception: read only files"
+test_subtest_broken_for_root
 chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
 output=$(notmuch tag +something '*' 2>&1 | sed 's/: .*$//' )
 chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*

diff --git a/test/test-lib.sh b/test/test-lib.sh
index eec5c5b4508c1224d7b2510fe3822ce13e374bc0..1a6525dfa0e0d508b5289ad67f77dba8809e1cb9 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -740,6 +740,12 @@ test_subtest_known_broken () {
        test_subtest_known_broken_=t
 }
 
+test_subtest_broken_for_root () {
+   if [ "$EUID" = "0" ]; then
+       test_subtest_known_broken_=t
+    fi
+}
+
 test_expect_success () {
        exec 1>&6 2>&7          # Restore stdout and stderr
        if [ -z "$inside_subtest" ]; then