Branch b1_5

b=9858
remove all special mountconf test exceptions

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index e18a99c..e893c43 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -5,11 +5,6 @@ set -e
 #         bug  2986 5494 7288
 ALWAYS_EXCEPT="20b  24   27 $RECOVERY_SMALL_EXCEPT"
 
-# Tests that always fail with mountconf -- FIXME
-# 16 fails with 1, not evicted
-EXCEPT="$EXCEPT 16 18a 18b"
-
-
 LUSTRE=${LUSTRE:-`dirname $0`/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 4e17acd..95247d8 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -334,12 +334,12 @@ replay_barrier_nodf() {
 }
 
 mds_evict_client() {
-    UUID=`cat /proc/fs/lustre/mdc/*_MNT_*/uuid`
+    UUID=`cat /proc/fs/lustre/mdc/*-mdc-*/uuid`
     do_facet mds "echo $UUID > /proc/fs/lustre/mds/${mds_svc}/evict_client"
 }
 
 ost_evict_client() {
-    UUID=`cat /proc/fs/lustre/osc/*_MNT_*/uuid | head -n 1`
+    UUID=`cat /proc/fs/lustre/osc/${ost1_svc}-osc-*/uuid`
     do_facet ost1 "echo $UUID > /proc/fs/lustre/obdfilter/${ost1_svc}/evict_client"
 }