envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-06-14 00:42:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ts: add cascading tests with module-forbid in 20/119

Browse Source
This commit is contained in:
Xavier Delaruelle
2020-08-14 14:14:02 +02:00
parent c7e7efe544
commit 2fb7e883ee
5 changed files with 126 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
testsuite/etc/modulerc.hide
View File

@@ -107,6 +107,36 @@ if {[info exists env(TESTSUITE_HIDE1_CASC3_SET8)]} {
module-hide hide1
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET1)]} {
module-hide hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET2)]} {
module-forbid hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET3)]} {
module-hide --soft hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET4)]} {
module-forbid hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET5)]} {
module-hide hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET6)]} {
module-forbid --not-user [module-info username] hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET7)]} {
module-forbid hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET8)]} {
module-forbid hide1
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET9)]} {
module-hide hide1
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET10)]} {
module-forbid hide1/5.0
}
# 20/115 module-forbid tests
if {[info exists env(TESTSUITE_FORBID2_SET8)]} {

30
testsuite/modulefiles.2/hide1/.modulerc
View File

@@ -168,6 +168,36 @@ if {[info exists env(TESTSUITE_HIDE1_CASC3_SET8)]} {
module-hide --soft --not-group [module-info usergroups] hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET1)]} {
module-forbid hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET2)]} {
module-hide hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET3)]} {
module-forbid hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET4)]} {
module-hide --soft hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET5)]} {
module-forbid --not-group [module-info usergroups] hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET6)]} {
module-hide hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET7)]} {
module-forbid hide1
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET8)]} {
module-forbid hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET9)]} {
module-forbid hide1/5.0
}
if {[info exists env(TESTSUITE_HIDE1_CASC4_SET10)]} {
module-hide hide1
}
# 20/115 module-forbid tests
if {[info exists env(TESTSUITE_FORBID_ERR1)]} {

16
testsuite/modules.20-locate/115-forbid.exp
View File

@@ -59,10 +59,10 @@ if {[cmpversion $tclsh_version 8.6] == -1} {
\"if \{\[info exists env(TESTSUITE_FORBID_ERR1)\]\} \{
module-forbid
\}\""
set linenum 173
set linenum 203
} else {
set custom {}
set linenum 174
set linenum 204
}
set tserr [msg_moderr {No module specified in argument} {module-forbid} $mp/hide1/.modulerc $linenum { } {} {} $custom]
testouterr_cmd sh {load hide1@3.10:4.20} $ans $tserr
@@ -77,10 +77,10 @@ if {[cmpversion $tclsh_version 8.6] == -1} {
\"if \{\[info exists env(TESTSUITE_FORBID_ERR2)\]\} \{
module-forbid @:1.2
\}\""
set linenum 176
set linenum 206
} else {
set custom {}
set linenum 177
set linenum 207
}
set tserr [msg_moderr {No module name defined in argument '@:1.2'} {module-forbid @:1.2} $mp/hide1/.modulerc $linenum { } {} {} $custom]
testouterr_cmd sh {load hide1@3.10:4.20} $ans $tserr
@@ -102,10 +102,10 @@ if {[cmpversion $tclsh_version 8.6] == -1} {
\"if \{\[info exists env(TESTSUITE_FORBID_ERR3)\]\} \{
module-forbid -foo hide2
\}\""
set linenum 179
set linenum 209
} else {
set custom {}
set linenum 180
set linenum 210
}
set tserr [string map {<EXTMATCH> (.*)+} [escre [msg_moderr {Invalid option '-foo'} $errmsg $mp/hide1/.modulerc $linenum { } {} {} $custom]]]
testouterr_cmd_re sh {load hide1@3.10:4.20} $ans $tserr
@@ -127,10 +127,10 @@ if {[cmpversion $tclsh_version 8.6] == -1} {
\"if \{\[info exists env(TESTSUITE_FORBID_ERR4)\]\} \{
module-forbid --foo hide2
\}\""
set linenum 182
set linenum 212
} else {
set custom {}
set linenum 183
set linenum 213
}
set tserr [string map {<EXTMATCH> (.*)+} [escre [msg_moderr {Invalid option '--foo'} $errmsg $mp/hide1/.modulerc $linenum { } {} {} $custom]]]
testouterr_cmd_re sh {load hide1@3.10:4.20} $ans $tserr

4
testsuite/modules.20-locate/117-forbid-user-group.exp
View File

@@ -111,10 +111,10 @@ if {[cmpversion $tclsh_version 8.6] == -1} {
\"if \{\[info exists env(TESTSUITE_FORBID_ALLOW_USER_GROUP_ERR_SET2)\]\} \{
module-forbid --not-group hide1/5.0 --not-user
\}\""
set linenum 225
set linenum 255
} else {
set custom {}
set linenum 226
set linenum 256
}
set tserr3 [msg_moderr {Missing value for '--not-user' option} {module-forbid --not-group hide1/5.0 --not-user} $mp/hide1/.modulerc $linenum { } {} {} $custom]

56
testsuite/modules.20-locate/119-hide-cascading.exp
View File

@@ -185,6 +185,62 @@ testouterr_cmd sh {avail -t hide1@5:} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC3_SET8
# test cascading definition with module-forbid command
setenv_var TESTSUITE_HIDE1_CASC4_SET1 1
testouterr_cmd sh {load hide1@5:} ERR $err_path'hide1@5:'
testouterr_cmd sh {load hide1@5.0} ERR [err_accessdenied hide1/5.0]
testouterr_cmd sh {avail -t hide1@5:} OK {}
testouterr_cmd sh {avail -t hide1@5.0} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC4_SET1
setenv_var TESTSUITE_HIDE1_CASC4_SET2 1
testouterr_cmd sh {load hide1@5:} ERR $err_path'hide1@5:'
testouterr_cmd sh {load hide1@5.0} ERR [err_accessdenied hide1/5.0]
testouterr_cmd sh {avail -t hide1@5:} OK {}
testouterr_cmd sh {avail -t hide1@5.0} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC4_SET2
setenv_var TESTSUITE_HIDE1_CASC4_SET3 1
testouterr_cmd sh {load hide1@5.0} ERR [err_accessdenied hide1/5.0]
testouterr_cmd sh {avail -t hide1@5.0} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC4_SET3
setenv_var TESTSUITE_HIDE1_CASC4_SET4 1
testouterr_cmd sh {load hide1@5.0} ERR [err_accessdenied hide1/5.0]
testouterr_cmd sh {avail -t hide1@5.0} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC4_SET4
setenv_var TESTSUITE_HIDE1_CASC4_SET5 1
testouterr_cmd sh {load hide1@5.0} $ans {}
testouterr_cmd sh {avail -t hide1@5.0} OK $mp:\nhide1/5.0
unsetenv_var TESTSUITE_HIDE1_CASC4_SET5
setenv_var TESTSUITE_HIDE1_CASC4_SET6 1
testouterr_cmd sh {load hide1@5.0} $ans {}
testouterr_cmd sh {avail -t hide1@5.0} OK $mp:\nhide1/5.0
unsetenv_var TESTSUITE_HIDE1_CASC4_SET6
setenv_var TESTSUITE_HIDE1_CASC4_SET7 1
testouterr_cmd sh {load hide1@5.0} ERR [err_accessdenied hide1/5.0]
testouterr_cmd sh {avail -t hide1@5.0} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC4_SET7
setenv_var TESTSUITE_HIDE1_CASC4_SET8 1
testouterr_cmd sh {load hide1@5.0} ERR [err_accessdenied hide1/5.0]
testouterr_cmd sh {avail -t hide1@5.0} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC4_SET8
setenv_var TESTSUITE_HIDE1_CASC4_SET9 1
testouterr_cmd sh {load hide1@5.0} ERR [err_accessdenied hide1/5.0]
testouterr_cmd sh {avail -t hide1@5.0} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC4_SET9
setenv_var TESTSUITE_HIDE1_CASC4_SET10 1
testouterr_cmd sh {load hide1@5.0} ERR [err_accessdenied hide1/5.0]
testouterr_cmd sh {avail -t hide1@5.0} OK {}
unsetenv_var TESTSUITE_HIDE1_CASC4_SET10
#
# Cleanup
#