diff --git a/testsuite/expect/test21.24 b/testsuite/expect/test21.24
index 27a26a92bad8bf7f5a31b6448bfe61299f60be90..5ed4929a4fe6944093e5f8c5d42166c71a4f5fa8 100755
--- a/testsuite/expect/test21.24
+++ b/testsuite/expect/test21.24
@@ -34,7 +34,6 @@
source ./globals_accounting
set test_id "test21.24"
-set test_nu "test21-24"
set file_in "$test_id.input"
set file_in2 "$test_id.input2"
set file_in3 "$test_id.input3"
@@ -53,15 +52,15 @@ set wco withcoordinator
set par Parent
set roo root
set clu Cluster
-set tc1 [format "%s%s" $test_nu "clus1"]
-set tc2 [format "%s%s" $test_nu "clus2"]
-set tc3 [format "%s%s" $test_nu "clus3"]
+set tc1 slurm_test-cluster.1
+set tc2 slurm_test-cluster.2
+set tc3 slurm_test-cluster.3
set acc Account
set nams names
-set nm1 [format "%s%s" $test_nu "acct1"]
-set nm2 [format "%s%s" $test_nu "acct2"]
-set nm3 [format "%s%s" $test_nu "acct3"]
-set nm4 [format "%s%s" $test_nu "acct4"]
+set ta1 slurm_test-account.1
+set ta2 slurm_test-account.2
+set ta3 slurm_test-account.3
+set ta4 slurm_test-account.4
set dsc Description
set ds1 scienceacct
set ds2 physicsacct
@@ -73,10 +72,10 @@ set or2 physicsorg
set or3 theoryorg
set or4 appliedorg
set usr User
-set us1 [format "%s%s" $test_nu "user1"]
-set us2 [format "%s%s" $test_nu "user2"]
-set us3 [format "%s%s" $test_nu "user3"]
-set us4 [format "%s%s" $test_nu "user4"]
+set tu1 slurm_test-user.1
+set tu2 slurm_test-user.2
+set tu3 slurm_test-user.3
+set tu4 slurm_test-user.4
set qs QOS
set qs1 tnormal
set qs2 runfirst
@@ -227,8 +226,8 @@ if { [string compare [check_accounting_admin_level] "Administrator"] } {
}
#make sure we have a clean system and permission to do this work
-remove_user "" "" "$us1,$us2,$us3,$us4"
-remove_acct "" "$nm1,$nm2,$nm3,$nm4"
+remove_user "" "" "$tu1,$tu2,$tu3,$tu4"
+remove_acct "" "$ta1,$ta2,$ta3,$ta4"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
if {$access_err != 0} {
@@ -239,8 +238,8 @@ if {$access_err != 0} {
#add qos
incr exit_code [add_qos "$qs2"]
if { $exit_code } {
- remove_user "" "" "$us1,$us2,$us3,$us4"
- remove_acct "" "$nm1,$nm2,$nm3,$nm4"
+ remove_user "" "" "$tu1,$tu2,$tu3,$tu4"
+ remove_acct "" "$ta1,$ta2,$ta3,$ta4"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
@@ -250,8 +249,8 @@ if { $exit_code } {
#name QOS Fairshare GrpCPUs GrpJobs GrpNodes GrpSubmitJobs MaxCPUMins MaxCPUs MaxJobs MaxNodes MaxSubmitJobs MaxWallDurationPerJob
incr exit_code [add_cluster "$tc3" "$qs2" "$fs6" "$gc6" "$gj6" "$gn6" "$gs6" "$mm6" "$mc6" "$mj6" "$mn6" "$ms6" "$mw6"]
if { $exit_code } {
- remove_user "" "" "$us1,$us2,$us3,$us4"
- remove_acct "" "$nm1,$nm2,$nm3,$nm4"
+ remove_user "" "" "$tu1,$tu2,$tu3,$tu4"
+ remove_acct "" "$ta1,$ta2,$ta3,$ta4"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
@@ -259,28 +258,28 @@ if { $exit_code } {
#add accounts
#cluster parent name description organization qos Fairshare GrpCPUMins GrpCPUs GrpJobs GrpNodes GrpSubmitJobs GrpWall MaxCPUMins MaxCPUs MaxJobs MaxNodes MaxSubmitJobs MaxWallDurationPerJob
-incr exit_code [add_acct "$tc3" "$roo" "$nm4" "$ds4" "$or4" "$qs2" "$fs5" "$gm5" "$gc5" "$gj5" "$gn5" "$gs5" "$gw5" "$mm5" "$mc5" "$mj5" "$mn5" "$ms5" "$mw5"]
+incr exit_code [add_acct "$tc3" "$roo" "$ta4" "$ds4" "$or4" "$qs2" "$fs5" "$gm5" "$gc5" "$gj5" "$gn5" "$gs5" "$gw5" "$mm5" "$mc5" "$mj5" "$mn5" "$ms5" "$mw5"]
if { $exit_code } {
- remove_user "" "" "$us1,$us2,$us3,$us4"
- remove_acct "" "$nm1,$nm2,$nm3,$nm4"
- remove_qos "$qs1,$qs2,$qs3"
+ remove_user "" "" "$tu1,$tu2,$tu3,$tu4"
+ remove_acct "" "$ta1,$ta2,$ta3,$ta4"
+ remove_qos "$qs1,$qs2,tas3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
}
-incr exit_code [add_acct "$tc3" "$nm4" "$nm3" "$ds3" "$or3" "$qs2" "$fs4" "$gm4" "$gc4" "$gj4" "$gn4" "$gs4" "$gw4" "$mm4" "$mc4" "$mj4" "$mn4" "$ms4" "$mw4"]
+incr exit_code [add_acct "$tc3" "$ta4" "$ta3" "$ds3" "$or3" "$qs2" "$fs4" "$gm4" "$gc4" "$gj4" "$gn4" "$gs4" "$gw4" "$mm4" "$mc4" "$mj4" "$mn4" "$ms4" "$mw4"]
if { $exit_code } {
- remove_user "" "" "$us1,$us2,$us3,$us4"
- remove_acct "" "$nm1,$nm2,$nm3,$nm4"
+ remove_user "" "" "$tu1,$tu2,$tu3,$tu4"
+ remove_acct "" "$ta1,$ta2,$ta3,$ta4"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
}
-incr exit_code [add_acct "$tc3" "$nm3" "$nm2" "$ds2" "$or2" "$qs2" "$fs3" "$gm3" "$gc3" "$gj3" "$gn3" "$gs3" "$gw3" "$mm3" "$mc3" "$mj3" "$mn3" "$ms3" "$mw3"]
+incr exit_code [add_acct "$tc3" "$ta3" "$ta2" "$ds2" "$or2" "$qs2" "$fs3" "$gm3" "$gc3" "$gj3" "$gn3" "$gs3" "$gw3" "$mm3" "$mc3" "$mj3" "$mn3" "$ms3" "$mw3"]
if { $exit_code } {
- remove_user "" "" "$us1,$us2,$us3,$us4"
- remove_acct "" "$nm1,$nm2,$nm3,$nm4"
+ remove_user "" "" "$tu1,$tu2,$tu3,$tu4"
+ remove_acct "" "$ta1,$ta2,$ta3,$ta4"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
@@ -288,28 +287,28 @@ if { $exit_code } {
#add users
# cluster account name part adminlevel defaultaccount defaultwckey wckeys qoslevel Fairshare GrpCPUMins GrpCPUs GrpJobs GrpNodes GrpSubmitJobs GrpWall MaxCPUMins MaxCPUs MaxJobs MaxNodes MaxSubmitJobs MaxWallDurationPerJob
-incr exit_code [add_user "$tc3" "$nm4" "$us3" "" "$ala" "$nm3" "$wk3" "$wk1,$wk2,$wk4" "$qs2" "$fs3" "$gm3" "$gc3" "$gj3" "$gn3" "$gs3" "$gw3" "$mm3" "$mc3" "$mj3" "$mn3" "$ms3" "$mw3" ]
+incr exit_code [add_user "$tc3" "$ta4" "$tu3" "" "$ala" "$ta3" "$wk3" "$wk1,$wk2,$wk4" "$qs2" "$fs3" "$gm3" "$gc3" "$gj3" "$gn3" "$gs3" "$gw3" "$mm3" "$mc3" "$mj3" "$mn3" "$ms3" "$mw3" ]
if { $exit_code } {
- remove_user "" "" "$us1,$us2,$us3,$us4"
- remove_acct "" "$nm1,$nm2,$nm3,$nm4"
+ remove_user "" "" "$tu1,$tu2,$tu3,$tu4"
+ remove_acct "" "$ta1,$ta2,$ta3,$ta4"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
}
-incr exit_code [add_user "$tc3" "$nm3" "$us2" "" "$alo" "$nm2" "$wk2" "$wk1,$wk3,$wk4" "$qs2" "$fs2" "$gm2" "$gc2" "$gj2" "$gn2" "$gs2" "$gw2" "$mm2" "$mc2" "$mj2" "$mn2" "$ms2" "$mw2" ]
+incr exit_code [add_user "$tc3" "$ta3" "$tu2" "" "$alo" "$ta2" "$wk2" "$wk1,$wk3,$wk4" "$qs2" "$fs2" "$gm2" "$gc2" "$gj2" "$gn2" "$gs2" "$gw2" "$mm2" "$mc2" "$mj2" "$mn2" "$ms2" "$mw2" ]
if { $exit_code } {
- remove_user "" "" "$us1,$us2,$us3,$us4"
- remove_acct "" "$nm1,$nm2,$nm3,$nm4"
+ remove_user "" "" "$tu1,$tu2,$utu3,$tu4"
+ remove_acct "" "$ta1,$ta2,$ta3,$ta4"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
}
-incr exit_code [add_user "$tc3" "$nm2" "$us1" "" "$aln" "$nm2" "$wk1" "$wk2,$wk3,$wk4" "$qs2" "$fs1" "$gm1" "$gc1" "$gj1" "$gn1" "$gs1" "$gw1" "$mm1" "$mc1" "$mj1" "$mn1" "$ms1" "$mw1" ]
+incr exit_code [add_user "$tc3" "$ta2" "$tu1" "" "$aln" "$ta2" "$wk1" "$wk2,$wk3,$wk4" "$qs2" "$fs1" "$gm1" "$gc1" "$gj1" "$gn1" "$gs1" "$gw1" "$mm1" "$mc1" "$mj1" "$mn1" "$ms1" "$mw1" ]
if { $exit_code } {
- remove_user "" "" "$us1,$us2,$us3,$us4"
- remove_acct "" "$nm1,$nm2,$nm3,$nm4"
+ remove_user "" "" "$tu1,$tu2,$tu3,$tu4"
+ remove_acct "" "$ta1,$ta2,$ta3,$ta4"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
@@ -374,32 +373,32 @@ while {[gets $tfile line] != -1} {
} elseif {![string compare $line "$usr - $roo:$dac='$roo':$al='$ala':DefaultQOS='':$fs=1"]} {
send_user "match 3\n"
incr matches
- } elseif {![string compare $line "$acc - $nm4:$dsc='$ds4':$org='$or4':DefaultQOS='':$fs=$fs5:$gm=$gm5:$gc=$gc5:$gj=$gj5:$gn=$gn5:$gs=$gs5:$gw=$gw5:$mp=$mm5:$mu=$mc5:$mj=$mj5:$mnj=$mn5:$ms=$ms5:$md=$mw5:$qs='$qs2'"]} {
+ } elseif {![string compare $line "$acc - $ta4:$dsc='$ds4':$org='$or4':DefaultQOS='':$fs=$fs5:$gm=$gm5:$gc=$gc5:$gj=$gj5:$gn=$gn5:$gs=$gs5:$gw=$gw5:$mp=$mm5:$mu=$mc5:$mj=$mj5:$mnj=$mn5:$ms=$ms5:$md=$mw5:$qs='$qs2'"]} {
send_user "match 4\n"
incr matches
- } elseif {![string compare $line "$par - $nm4"]} {
+ } elseif {![string compare $line "$par - $ta4"]} {
send_user "match 5\n"
incr matches
- } elseif {![string compare $line "$usr - $us3:$dac='$nm3':$dw='$wk3':$al='$ala':$wk='$wk3,$wk1,$wk2,$wk4':DefaultQOS='':$fs=$fs3:$gm=$gm3:$gc=$gc3:$gj=$gj3:$gn=$gn3:$gs=$gs3:$gw=$gw3:$mp=$mm3:$mu=$mc3:$mj=$mj3:$mnj=$mn3:$ms=$ms3:$md=$mw3:$qs='$qs2'"]} {
+ } elseif {![string compare $line "$usr - $tu3:$dac='$ta3':$dw='$wk3':$al='$ala':$wk='$wk3,$wk1,$wk2,$wk4':DefaultQOS='':$fs=$fs3:$gm=$gm3:$gc=$gc3:$gj=$gj3:$gn=$gn3:$gs=$gs3:$gw=$gw3:$mp=$mm3:$mu=$mc3:$mj=$mj3:$mnj=$mn3:$ms=$ms3:$md=$mw3:$qs='$qs2'"]} {
# should come through 2 times
send_user "match 6\n"
incr matches
- } elseif {![string compare $line "$acc - $nm3:$dsc='$ds3':$org='$or3':DefaultQOS='':$fs=$fs4:$gm=$gm4:$gc=$gc4:$gj=$gj4:$gn=$gn4:$gs=$gs4:$gw=$gw4:$mp=$mm4:$mu=$mc4:$mj=$mj4:$mnj=$mn4:$ms=$ms4:$md=$mw4:$qs='$qs2'"]} {
+ } elseif {![string compare $line "$acc - $ta3:$dsc='$ds3':$org='$or3':DefaultQOS='':$fs=$fs4:$gm=$gm4:$gc=$gc4:$gj=$gj4:$gn=$gn4:$gs=$gs4:$gw=$gw4:$mp=$mm4:$mu=$mc4:$mj=$mj4:$mnj=$mn4:$ms=$ms4:$md=$mw4:$qs='$qs2'"]} {
send_user "match 7\n"
incr matches
- } elseif {![string compare $line "$par - $nm3"]} {
+ } elseif {![string compare $line "$par - $ta3"]} {
send_user "match 8\n"
incr matches
- } elseif {![string compare $line "$acc - $nm2:$dsc='$ds2':$org='$or2':DefaultQOS='':$fs=$fs3:$gm=$gm3:$gc=$gc3:$gj=$gj3:$gn=$gn3:$gs=$gs3:$gw=$gw3:$mp=$mm3:$mu=$mc3:$mj=$mj3:$mnj=$mn3:$ms=$ms3:$md=$mw3:$qs='$qs2'"]} {
+ } elseif {![string compare $line "$acc - $ta2:$dsc='$ds2':$org='$or2':DefaultQOS='':$fs=$fs3:$gm=$gm3:$gc=$gc3:$gj=$gj3:$gn=$gn3:$gs=$gs3:$gw=$gw3:$mp=$mm3:$mu=$mc3:$mj=$mj3:$mnj=$mn3:$ms=$ms3:$md=$mw3:$qs='$qs2'"]} {
send_user "match 9\n"
incr matches
- } elseif {![string compare $line "$par - $nm2"]} {
+ } elseif {![string compare $line "$par - $ta2"]} {
send_user "match 10\n"
incr matches
- } elseif {![string compare $line "$usr - $us1:$dac='$nm2':$dw='$wk1':$wk='$wk3,$wk1,$wk2,$wk4':DefaultQOS='':$fs=$fs1:$gm=$gm1:$gc=$gc1:$gj=$gj1:$gn=$gn1:$gs=$gs1:$gw=$gw1:$mp=$mm1:$mu=$mc1:$mj=$mj1:$mnj=$mn1:$ms=$ms1:$md=$mw1:$qs='$qs2'"]} {
+ } elseif {![string compare $line "$usr - $tu1:$dac='$ta2':$dw='$wk1':$wk='$wk3,$wk1,$wk2,$wk4':DefaultQOS='':$fs=$fs1:$gm=$gm1:$gc=$gc1:$gj=$gj1:$gn=$gn1:$gs=$gs1:$gw=$gw1:$mp=$mm1:$mu=$mc1:$mj=$mj1:$mnj=$mn1:$ms=$ms1:$md=$mw1:$qs='$qs2'"]} {
send_user "match 11\n"
incr matches
- } elseif {![string compare $line "$usr - $us2:$dac='$nm2':$dw='$wk2':$al='$alo':$wk='$wk3,$wk1,$wk2,$wk4':DefaultQOS='':$fs=$fs2:$gm=$gm2:$gc=$gc2:$gj=$gj2:$gn=$gn2:$gs=$gs2:$gw=$gw2:$mp=$mm2:$mu=$mc2:$mj=$mj2:$mnj=$mn2:$ms=$ms2:$md=$mw2:$qs='$qs2'"]} {
+ } elseif {![string compare $line "$usr - $tu2:$dac='$ta2':$dw='$wk2':$al='$alo':$wk='$wk3,$wk1,$wk2,$wk4':DefaultQOS='':$fs=$fs2:$gm=$gm2:$gc=$gc2:$gj=$gj2:$gn=$gn2:$gs=$gs2:$gw=$gw2:$mp=$mm2:$mu=$mc2:$mj=$mj2:$mnj=$mn2:$ms=$ms2:$md=$mw2:$qs='$qs2'"]} {
# should come through 2 times
send_user "match 12\n"
incr matches
@@ -414,14 +413,14 @@ if {$matches != 14} {
#
# This is the end below here
-incr exit_code [remove_user "" "" "$us1,$us2,$us3,$us4"]
-incr exit_code [remove_acct "" "$nm1,$nm2,$nm3,$nm4"]
+incr exit_code [remove_user "" "" "$tu1,$tu2,$tu3,$tu4"]
+incr exit_code [remove_acct "" "$ta1,$ta2,$ta3,$ta4"]
incr exit_code [remove_qos "$qs1,$qs2,$qs3"]
incr exit_code [remove_cluster "$tc1,$tc2,$tc3"]
if {$exit_code == 0} {
exec $bin_rm -f $file_out4
- send_user "\nSUCCESS\n"
+ print_success $test_id
} else {
send_user "\nFAILURE\n"
}