Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6496 ptlrpc: Fix wrong code indentation in plain_authorize
[fs/lustre-release.git]
/
lustre
/
tests
/
sanity-krb5.sh
diff --git
a/lustre/tests/sanity-krb5.sh
b/lustre/tests/sanity-krb5.sh
index
6d3ba8e
..
5306591
100755
(executable)
--- a/
lustre/tests/sanity-krb5.sh
+++ b/
lustre/tests/sanity-krb5.sh
@@
-719,7
+719,7
@@
test_102() {
run_test 102 "survive from insanely fast flavor switch"
test_150() {
run_test 102 "survive from insanely fast flavor switch"
test_150() {
- local
save
_opts
+ local
mount
_opts
local count
local clients=$CLIENTS
local count
local clients=$CLIENTS
@@
-736,18
+736,14
@@
test_150() {
zconf_umount_clients $clients $MOUNT || return 1
# mount client with conflict flavor - should fail
zconf_umount_clients $clients $MOUNT || return 1
# mount client with conflict flavor - should fail
- save_opts=$MOUNTOPT
- MOUNTOPT="$MOUNTOPT,mgssec=krb5p"
- zconf_mount_clients $clients $MOUNT &&
+ mount_opts="${MOUNT_OPTS:+$MOUNT_OPTS,}mgssec=krb5p"
+ zconf_mount_clients $clients $MOUNT $mount_opts &&
error "mount with conflict flavor should have failed"
error "mount with conflict flavor should have failed"
- MOUNTOPT=$save_opts
# mount client with same flavor - should succeed
# mount client with same flavor - should succeed
- save_opts=$MOUNTOPT
- MOUNTOPT="$MOUNTOPT,mgssec=null"
- zconf_mount_clients $clients $MOUNT ||
+ mount_opts="${MOUNT_OPTS:+$MOUNT_OPTS,}mgssec=null"
+ zconf_mount_clients $clients $MOUNT $mount_opts ||
error "mount with same flavor should have succeeded"
error "mount with same flavor should have succeeded"
- MOUNTOPT=$save_opts
zconf_umount_clients $clients $MOUNT || return 2
# mount client with default flavor - should succeed
zconf_umount_clients $clients $MOUNT || return 2
# mount client with default flavor - should succeed