Skip to content

Commit 5b7245e

Browse files
committed
ts: test --user/--group on module-forbid
1 parent cbd2eb5 commit 5b7245e

File tree

2 files changed

+139
-0
lines changed

2 files changed

+139
-0
lines changed

testsuite/modulefiles.2/hide1/.modulerc

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,3 +713,74 @@ if {[info exists env(TESTSUITE_HIDE_USER_GROUP)]} {
713713
}
714714
}
715715
}
716+
717+
# 20/117 --user and --group tests
718+
if {[info exists env(TESTSUITE_FORBID_USER_GROUP)]} {
719+
switch -- $env(TESTSUITE_FORBID_USER_GROUP) {
720+
user2 {
721+
module-forbid --user [list unknown1 [module-info username] unknown2] hide1
722+
}
723+
user3 {
724+
module-forbid --user [list unknown1 unknown2] hide1
725+
}
726+
user_time1 {
727+
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
728+
module-forbid --user [module-info username] --after $tomorrow hide1
729+
}
730+
user_time2 {
731+
set yesterday [clock format [expr {[clock seconds]-86400}] -format %Y-%m-%d]
732+
module-forbid --user [module-info username] --after $yesterday hide1
733+
}
734+
user_time3 {
735+
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
736+
module-forbid --user unknown1 --after $tomorrow hide1
737+
}
738+
user_time4 {
739+
set yesterday [clock format [expr {[clock seconds]-86400}] -format %Y-%m-%d]
740+
module-forbid --user unknown1 --after $yesterday hide1
741+
}
742+
user_notgroup3 {
743+
module-forbid --user [module-info username] --not-group [module-info usergroups] hide1
744+
}
745+
user_notgroup4 {
746+
module-forbid --user unknown1 --not-group unknown1 hide1
747+
}
748+
group2 {
749+
module-forbid --group [concat [list unknown1 unknown2] [module-info usergroups]] hide1
750+
}
751+
group3 {
752+
module-forbid --group [list unknown1 unknown2] hide1
753+
}
754+
group_time1 {
755+
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
756+
module-forbid --group [module-info usergroups] --after $tomorrow hide1
757+
}
758+
group_time2 {
759+
set yesterday [clock format [expr {[clock seconds]-86400}] -format %Y-%m-%d]
760+
module-forbid --group [module-info usergroups] --after $yesterday hide1
761+
}
762+
group_time3 {
763+
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
764+
module-forbid --group unknown1 --after $tomorrow hide1
765+
}
766+
group_time4 {
767+
set yesterday [clock format [expr {[clock seconds]-86400}] -format %Y-%m-%d]
768+
module-forbid --group unknown1 --after $yesterday hide1
769+
}
770+
group_notuser1 {
771+
module-forbid --group [module-info usergroups] --not-user unknown1 hide1
772+
}
773+
group_notuser2 {
774+
module-forbid --group unknown1 --not-user [module-info username] hide1
775+
}
776+
group_user1 {
777+
module-forbid --group [module-info usergroups] --user unknown1 hide1
778+
}
779+
group_user2 {
780+
module-forbid --group unknown1 --user [module-info username] hide1
781+
}
782+
group_user_notuser_notgroup2 {
783+
module-forbid --group unknown1 --user unknown1 hide1 --not-user unknown1 --not-group unknown1 hide1
784+
}
785+
}
786+
}

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,74 @@ unsetenv_var TESTSUITE_FORBID_ALLOW_USER_GROUP_ERR_SET2
139139
}
140140

141141

142+
#
143+
# --user/--group options test
144+
#
145+
146+
setenv_var MODULES_NEARLY_FORBIDDEN_DAYS 2
147+
148+
set tserr_forbidden "$mp:\nhide1/5.0 <F>"
149+
set tserr_not_forbidden $mp:\nhide1/5.0
150+
set tserr_nearly_forbidden "$mp:\nhide1/5.0 <nF>"
151+
152+
setenv_var TESTSUITE_FORBID_USER_GROUP user2
153+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_forbidden
154+
155+
setenv_var TESTSUITE_FORBID_USER_GROUP user3
156+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
157+
158+
setenv_var TESTSUITE_FORBID_USER_GROUP user_time1
159+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_nearly_forbidden
160+
161+
setenv_var TESTSUITE_FORBID_USER_GROUP user_time2
162+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_forbidden
163+
164+
setenv_var TESTSUITE_FORBID_USER_GROUP user_time3
165+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
166+
167+
setenv_var TESTSUITE_FORBID_USER_GROUP user_time4
168+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
169+
170+
setenv_var TESTSUITE_FORBID_USER_GROUP user_notgroup3
171+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_forbidden
172+
173+
setenv_var TESTSUITE_FORBID_USER_GROUP user_notgroup4
174+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
175+
176+
setenv_var TESTSUITE_FORBID_USER_GROUP group2
177+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_forbidden
178+
179+
setenv_var TESTSUITE_FORBID_USER_GROUP group3
180+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
181+
182+
setenv_var TESTSUITE_FORBID_USER_GROUP group_time1
183+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_nearly_forbidden
184+
185+
setenv_var TESTSUITE_FORBID_USER_GROUP group_time2
186+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_forbidden
187+
188+
setenv_var TESTSUITE_FORBID_USER_GROUP group_time3
189+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
190+
191+
setenv_var TESTSUITE_FORBID_USER_GROUP group_time4
192+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
193+
194+
setenv_var TESTSUITE_FORBID_USER_GROUP group_notuser1
195+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_forbidden
196+
197+
setenv_var TESTSUITE_FORBID_USER_GROUP group_notuser2
198+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
199+
200+
setenv_var TESTSUITE_FORBID_USER_GROUP group_user1
201+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_forbidden
202+
203+
setenv_var TESTSUITE_FORBID_USER_GROUP group_user2
204+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_forbidden
205+
206+
setenv_var TESTSUITE_FORBID_USER_GROUP group_user_notuser_notgroup2
207+
testouterr_cmd sh {avail -t hide1/5.0} OK $tserr_not_forbidden
208+
209+
142210
#
143211
# Cleanup
144212
#

0 commit comments

Comments
 (0)