117-forbid-user-group.exp (modules-5.1.1.tar.bz2) | : | 117-forbid-user-group.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 47 | skipping to change at line 47 | |||
# ensure default tag abbreviation is defined | # ensure default tag abbreviation is defined | |||
setenv_var MODULES_TAG_ABBREV {auto-loaded=aL:loaded=L:hidden=H:hidden-loaded=H: forbidden=F:nearly-forbidden=nF} | setenv_var MODULES_TAG_ABBREV {auto-loaded=aL:loaded=L:hidden=H:hidden-loaded=H: forbidden=F:nearly-forbidden=nF} | |||
set mp $modpath.2 | set mp $modpath.2 | |||
set mpre $modpathre.2 | set mpre $modpathre.2 | |||
setenv_path_var MODULEPATH $mp | setenv_path_var MODULEPATH $mp | |||
setenv_var MODULERCFILE $env(TESTSUITEDIR)/etc/modulerc.hide | setenv_var MODULERCFILE $env(TESTSUITEDIR)/etc/modulerc.hide | |||
if {$group_name_fetch_failed} { | ||||
send_user "\tSkip user group tests, as group name fetch failed\n" | ||||
} else { | ||||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMALTNAME hide1/5.0&as|hide1/latest] | lappend ans [list set __MODULES_LMALTNAME hide1/5.0&as|hide1/latest] | |||
lappend ans [list set _LMFILES_ $mp/hide1/5.0] | lappend ans [list set _LMFILES_ $mp/hide1/5.0] | |||
lappend ans [list set LOADEDMODULES hide1/5.0] | lappend ans [list set LOADEDMODULES hide1/5.0] | |||
set ans2 [list] | set ans2 [list] | |||
lappend ans2 [list set __MODULES_LMALTNAME hide1/5.0&as|hide1/latest] | lappend ans2 [list set __MODULES_LMALTNAME hide1/5.0&as|hide1/latest] | |||
lappend ans2 [list set _LMFILES_ $mp/hide1/5.0] | lappend ans2 [list set _LMFILES_ $mp/hide1/5.0] | |||
lappend ans2 [list set LOADEDMODULES hide1/5.0] | lappend ans2 [list set LOADEDMODULES hide1/5.0] | |||
lappend ans2 [list ERR] | lappend ans2 [list ERR] | |||
skipping to change at line 131 | skipping to change at line 135 | |||
set linenum 237 | set linenum 237 | |||
} | } | |||
set tserr3 [msg_moderr {Missing value for '--not-user' option} {module-forbid -- not-group hide1/5.0 --not-user} $mp/hide1/.modulerc $linenum { } {} {} $custom] | set tserr3 [msg_moderr {Missing value for '--not-user' option} {module-forbid -- not-group hide1/5.0 --not-user} $mp/hide1/.modulerc $linenum { } {} {} $custom] | |||
# test erroneous specification of --not-user and --not-group options | # test erroneous specification of --not-user and --not-group options | |||
setenv_var TESTSUITE_FORBID_ALLOW_USER_GROUP_ERR_SET2 1 | setenv_var TESTSUITE_FORBID_ALLOW_USER_GROUP_ERR_SET2 1 | |||
testouterr_cmd sh {load hide1@5:} $ans $tserr3 | testouterr_cmd sh {load hide1@5:} $ans $tserr3 | |||
testouterr_cmd sh {avail -t hide1@5:} OK $tserr1 | testouterr_cmd sh {avail -t hide1@5:} OK $tserr1 | |||
unsetenv_var TESTSUITE_FORBID_ALLOW_USER_GROUP_ERR_SET2 | unsetenv_var TESTSUITE_FORBID_ALLOW_USER_GROUP_ERR_SET2 | |||
} | ||||
# | # | |||
# Cleanup | # Cleanup | |||
# | # | |||
reset_test_env | reset_test_env | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 6 lines changed or added |