LU-2309 tests: ignore unknown configuration param

This patch improves conf-sanity test 42 to verify that
invalid sys config param should not prevent client/server
from mounting.

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: I083f0c143753ff2b990c91319db057ef8221992b
Reviewed-on: http://review.whamcloud.com/5031
Tested-by: Hudson
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 8511270..adbb9de 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1798,14 +1798,22 @@ run_test 41b "mount mds with --nosvc and --nomgs on first mount"
 
 test_42() { #bug 14693
         setup
-        check_mount || return 2
-        do_facet mgs $LCTL conf_param lustre.llite.some_wrong_param=10
-        umount_client $MOUNT
-        mount_client $MOUNT || return 1
-        cleanup
+        check_mount || error "client was not mounted"
+
+        do_facet mgs $LCTL conf_param $FSNAME.llite.some_wrong_param=10
+        umount_client $MOUNT ||
+                error "unmounting client failed with invalid llite param"
+        mount_client $MOUNT ||
+                error "mounting client failed with invalid llite param"
+
+        do_facet mgs $LCTL conf_param $FSNAME.sys.some_wrong_param=20
+        cleanup || error "stopping $FSNAME failed with invalid sys param"
+        setup
+        check_mount || "client was not mounted with invalid sys param"
+        cleanup || error "stopping $FSNAME failed with invalid sys param"
         return 0
 }
-run_test 42 "invalid config param should not prevent client from mounting"
+run_test 42 "allow client/server mount/unmount with invalid config param"
 
 test_43() {
     [ $UID -ne 0 -o $RUNAS_ID -eq 0 ] && skip_env "run as root"