From 2fb7e883ee9c5b7f03477be371fbc160488d6aed Mon Sep 17 00:00:00 2001 From: Xavier Delaruelle Date: Fri, 14 Aug 2020 14:14:02 +0200 Subject: [PATCH] ts: add cascading tests with module-forbid in 20/119 --- testsuite/etc/modulerc.hide | 30 ++++++++++ testsuite/modulefiles.2/hide1/.modulerc | 30 ++++++++++ testsuite/modules.20-locate/115-forbid.exp | 16 +++--- .../117-forbid-user-group.exp | 4 +- .../modules.20-locate/119-hide-cascading.exp | 56 +++++++++++++++++++ 5 files changed, 126 insertions(+), 10 deletions(-) diff --git a/testsuite/etc/modulerc.hide b/testsuite/etc/modulerc.hide index ed15482a..8807c93a 100644 --- a/testsuite/etc/modulerc.hide +++ b/testsuite/etc/modulerc.hide @@ -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)]} { diff --git a/testsuite/modulefiles.2/hide1/.modulerc b/testsuite/modulefiles.2/hide1/.modulerc index 3a5161da..03864b59 100644 --- a/testsuite/modulefiles.2/hide1/.modulerc +++ b/testsuite/modulefiles.2/hide1/.modulerc @@ -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)]} { diff --git a/testsuite/modules.20-locate/115-forbid.exp b/testsuite/modules.20-locate/115-forbid.exp index 8f41b420..9b13a748 100644 --- a/testsuite/modules.20-locate/115-forbid.exp +++ b/testsuite/modules.20-locate/115-forbid.exp @@ -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 { (.*)+} [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 { (.*)+} [escre [msg_moderr {Invalid option '--foo'} $errmsg $mp/hide1/.modulerc $linenum { } {} {} $custom]]] testouterr_cmd_re sh {load hide1@3.10:4.20} $ans $tserr diff --git a/testsuite/modules.20-locate/117-forbid-user-group.exp b/testsuite/modules.20-locate/117-forbid-user-group.exp index 4ff29822..1b16ba6b 100644 --- a/testsuite/modules.20-locate/117-forbid-user-group.exp +++ b/testsuite/modules.20-locate/117-forbid-user-group.exp @@ -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] diff --git a/testsuite/modules.20-locate/119-hide-cascading.exp b/testsuite/modules.20-locate/119-hide-cascading.exp index d6d3642a..c981becf 100644 --- a/testsuite/modules.20-locate/119-hide-cascading.exp +++ b/testsuite/modules.20-locate/119-hide-cascading.exp @@ -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 #