X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=63c9aaa4c744dd3dfee843450e5a0d652299e8b3;hp=71519de1924e9a58e979ee0d073425b9a81981a7;hb=0302cc9dc33a2c8cc013bd117d5b738fe3ae1a76;hpb=100c6012e9decb4cc320e1a75c92ae2431dd5961

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 71519de..63c9aaa4 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2231,15 +2231,23 @@ test_41b() {
 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
-        return 0
+	setup
+	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"