Skip to content

Commit c50ae06

Browse files
committed
ts: no nearly-forbidden warning on refresh/whatis/scan modes
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent c10dea5 commit c50ae06

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

testsuite/modules.20-locate/115-forbid.exp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -730,9 +730,6 @@ lappend ans [list set __MODULES_LMALTNAME hide1/5.0&as|hide1/latest]
730730
lappend ans [list set _LMFILES_ $mp/hide1/5.0]
731731
lappend ans [list set LOADEDMODULES hide1/5.0]
732732
lappend ans [list set __MODULES_LMTAG hide1/5.0&nearly-forbidden]
733-
set ans2 [list]
734-
lappend ans2 [list unset _LMFILES_]
735-
lappend ans2 [list unset LOADEDMODULES]
736733
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
737734
if {$install_nearlyforbiddendays >= 1} {
738735
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow]]
@@ -743,8 +740,17 @@ testouterr_cmd_re sh {display hide1/5.0} OK "$modlin\n$mpre/hide1/5.0:\n\nmodule
743740
testouterr_cmd_re sh {whatis hide1/5.0} OK "$modlin $mpre $modlin\n\\s+hide1/5.0: hide1/5.0"
744741
testouterr_cmd sh {avail -t hide1/5.0} OK "$mp:\nhide1/5.0 <nF>"
745742
setenv_loaded_module [list hide1/5.0] [list $mp/hide1/5.0]
743+
setenv_var __MODULES_LMTAG hide1/5.0&nearly-forbidden
744+
set ans2 [list]
745+
lappend ans2 [list unset _LMFILES_]
746+
lappend ans2 [list unset LOADEDMODULES]
747+
lappend ans2 [list unset __MODULES_LMTAG]
746748
testouterr_cmd sh {unload hide1/5.0} $ans2 {}
749+
setenv_var __MODULES_LMREFRESH hide1/5.0
750+
testouterr_cmd sh {refresh} OK {}
747751
unsetenv_loaded_module
752+
unsetenv_var __MODULES_LMTAG
753+
unsetenv_var __MODULES_LMREFRESH
748754
setenv_var MODULES_NEARLY_FORBIDDEN_DAYS 0
749755
set ans [list]
750756
lappend ans [list set __MODULES_LMALTNAME hide1/5.0&as|hide1/latest]
@@ -755,6 +761,9 @@ testouterr_cmd_re sh {display hide1/5.0} OK "$modlin\n$mpre/hide1/5.0:\n\nmodule
755761
testouterr_cmd_re sh {whatis hide1/5.0} OK "$modlin $mpre $modlin\n\\s+hide1/5.0: hide1/5.0"
756762
testouterr_cmd sh {avail -t hide1/5.0} OK "$mp:\nhide1/5.0"
757763
setenv_loaded_module [list hide1/5.0] [list $mp/hide1/5.0]
764+
set ans2 [list]
765+
lappend ans2 [list unset _LMFILES_]
766+
lappend ans2 [list unset LOADEDMODULES]
758767
testouterr_cmd sh {unload hide1/5.0} $ans2 {}
759768
unsetenv_loaded_module
760769
unsetenv_var TESTSUITE_FORBID1_NEARLY_SET1

0 commit comments

Comments
 (0)