From: Elena Gryaznova <grev@sun.com>
Date: Wed, 3 Feb 2010 19:25:32 +0000 (+0300)
Subject: b=20718 sanity-quota test_14b: improve error message
X-Git-Tag: v1_8_2_50~21
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9b4722b2b4aec199de22ef67982d77e74870c753;p=fs%2Flustre-release.git

b=20718 sanity-quota test_14b: improve error message

i=Andrew.Perepechko

make check_runas_id_ret () more verbose
---

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 502d644..fc056c9 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -2177,10 +2177,10 @@ test_98()
         local missing_users=""
 
         for user in $SANITY_QUOTA_USERS; do
-                check_runas_id_ret $user quota_usr "runas -u $user -g quota_usr" >/dev/null 2>/dev/null || \
+                check_runas_id_ret $user quota_usr "runas -u $user -g quota_usr" || \
                        missing_users="$missing_users $user"
         done
-        [ -n "$missing_users" ] && { skip_env "the following users are missing: $missing_users" ; return 0 ; }
+        [ -n "$missing_users" ] && { skip_env "different uid-s on client and servers, or missing users: $missing_users" ; return 0 ; }
 
         cleanupall
         formatall
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 7d2e70b..e17b012 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2523,7 +2523,10 @@ check_runas_id_ret() {
     mkdir $DIR/d0_runas_test
     chmod 0755 $DIR
     chown $myRUNAS_UID:$myRUNAS_GID $DIR/d0_runas_test
-    $myRUNAS touch $DIR/d0_runas_test/f$$ || myRC=1
+    if ! $myRUNAS touch $DIR/d0_runas_test/f$$ ; then
+        do_nodes --verbose $(comma_list $(nodes_list)) grep -w $myRUNAS_UID /etc/passwd
+        myRC=1
+    fi
     rm -rf $DIR/d0_runas_test
     return $myRC
 }