Skip to content
Snippets Groups Projects
Commit 3fc37a4e authored by Joseph P. Donaghy's avatar Joseph P. Donaghy
Browse files

Edit for extraneous variables and error messages.

parent 97b5d2aa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
testsuite/expect/test21.20
+ 50
− 91
View file @ 3fc37a4e
......@@ -34,64 +34,23 @@
source ./globals_accounting
set test_id "test21.20"
set test_nu "test21-20"
set exit_code 0
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 fs1 2500
set fs2 1700
set fs3 1
set mc1 1000000
set mc2 700000
set mc3 1
set mj1 50
set mj2 70
set mj3 1
set mn1 300
set mn2 700
set mn3 1
set mw1 01:00:00
set mw2 00:07:00
set mw3 00:01:00
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 des Description
set ds1 testaccounta1
set ds2 testacct
set org Organization
set or1 accountorga1
set or2 acttrg
set tc1 slurm_test-cluster.1
set tc2 slurm_test-cluster.2
set tc3 slurm_test-cluster.3
set ta1 slurm_test-account.1
set ta2 slurm_test-account.2
set ta3 slurm_test-account.3
set qs QosLevel
set qs1 tnormal
set qs2 texpedite
set qs3 tstandby
set par parent
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 al AdminLevel
set aln None
set ala Administrator
set tu1 slurm_test-user.1
set tu2 slurm_test-user.2
set tu3 slurm_test-user.3
set alo Operator
set dac DefaultAccount
set pts Partitions
set fs fairshare
set mc maxcpu
set mj maxjob
set mn maxnode
set mw maxwall
set dbu debug
set was withassoc
set access_err 0
#set user_name "id -u -n"
print_header $test_id
set timeout 60
......@@ -110,8 +69,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"
remove_acct "" "$nm1,$nm2,$nm3"
remove_user "" "" "$tu1,$tu2,$tu3"
remove_acct "" "$ta1,$ta2,$ta3"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
if {$access_err != 0} {
......@@ -122,8 +81,8 @@ if {$access_err != 0} {
#add cluster
incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
remove_acct "" "$nm1,$nm2,$nm3"
remove_user "" "" "$tu1,$tu2,$tu3"
remove_acct "" "$ta1,$ta2,$ta3"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
......@@ -132,18 +91,18 @@ if { $exit_code } {
#add qos
incr exit_code [add_qos "$qs1,$qs2,$qs3"]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
remove_acct "" "$nm1,$nm2,$nm3"
remove_user "" "" "$tu1,$tu2,$tu3"
remove_acct "" "$ta1,$ta2,$ta3"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
}
#add accounts
incr exit_code [add_acct "$tc1,$tc2,$tc3" "" "$nm1,$nm2,$nm3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
incr exit_code [add_acct "$tc1,$tc2,$tc3" "" "$ta1,$ta2,$ta3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
remove_acct "" "$nm1,$nm2,$nm3"
remove_user "" "" "$tu1,$tu2,$tu3"
remove_acct "" "$ta1,$ta2,$ta3"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
......@@ -152,10 +111,10 @@ if { $exit_code } {
#add users
# cluster account name part admin dacct dwckey wckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall
incr exit_code [add_user "$tc1,$tc2,$tc3" "$nm1,$nm2,$nm3" $us1,$us2,$us3 "" "$alo" "$nm2" "" "" "$qs1,$qs2" "" "" "" "" "" "" "" "" "" "" "" "" ""]
incr exit_code [add_user "$tc1,$tc2,$tc3" "$ta1,$ta2,$ta3" $tu1,$tu2,$tu3 "" "$alo" "$ta2" "" "" "$qs1,$qs2" "" "" "" "" "" "" "" "" "" "" "" "" ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
remove_acct "" "$nm1,$nm2,$nm3"
remove_user "" "" "$tu1,$tu2,$tu3"
remove_acct "" "$ta1,$ta2,$ta3"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
......@@ -165,13 +124,13 @@ if { $exit_code } {
# Use sacctmgr to list the test qos additions
#
set matches 0
set my_pid [spawn $sacctmgr -n -p list user format="User,QosLevel" names=$us1,$us2,$us3 $was]
set my_pid [spawn $sacctmgr -n -p list user format="User,QosLevel" names=$tu1,$tu2,$tu3 withassoc]
expect {
-re "There was a problem" {
send_user "FAILURE: there was a problem with the sacctmgr command\n"
incr exit_code 1
}
-re "(($us1|$us2|$us3).($qs1|$qs2))." {
-re "(($tu1|$tu2|$tu3).($qs1|$qs2))." {
incr matches
exp_continue
}
......@@ -186,7 +145,7 @@ expect {
}
if {$matches != 27} {
send_user "\nFAILURE: Account addition 1 incorrect with only $matches.\n"
send_user "\nFAILURE: Account addition 27 incorrect with only $matches.\n"
incr exit_code 1
}
......@@ -195,10 +154,10 @@ if {$matches != 27} {
# cluster account name part wadmin wdacct wdwckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall admin dacct dwckey
#
incr exit_code [mod_user "$tc1,$tc2,$tc3" "$nm2" $us1 "" "" "" "" "$qs3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
incr exit_code [mod_user "$tc1,$tc2,$tc3" "$ta2" $tu1 "" "" "" "" "$qs3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
remove_acct "" "$nm1,$nm2,$nm3"
remove_user "" "" "$tu1,$tu2,$tu3"
remove_acct "" "$ta1,$ta2,$ta3"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
......@@ -208,17 +167,17 @@ if { $exit_code } {
# Use sacctmgr to list the test qos modifications
#
set matches 0
set my_pid [spawn $sacctmgr -n -p list user format="User,QosLevel" names=$us1,$us2,$us3 $was]
set my_pid [spawn $sacctmgr -n -p list user format="User,QosLevel" names=$tu1,$tu2,$tu3 withassoc]
expect {
-re "There was a problem" {
send_user "FAILURE: there was a problem with the sacctmgr command\n"
incr exit_code 1
}
-re "$us1.$qs3." {
-re "$tu1.$qs3." {
incr matches
exp_continue
}
-re "($us2|$us3).$qs2.$qs1." {
-re "($tu2|$tu3).$qs2.$qs1." {
incr matches
exp_continue
}
......@@ -233,7 +192,7 @@ expect {
}
if {$matches != 21} {
send_user "\nFAILURE: Account addition 1 incorrect with only $matches.\n"
send_user "\nFAILURE: Account addition 21 incorrect with only $matches.\n"
incr exit_code 1
}
......@@ -241,10 +200,10 @@ if {$matches != 21} {
# account adminlevel cluster defaultaccount qoslevel name
# qoslevel waccounts wcluster wnames
#
incr exit_code [mod_user "$tc1,$tc2,$tc3" "$nm2" $us2 "" "" "" "" "+$qs3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
incr exit_code [mod_user "$tc1,$tc2,$tc3" "$ta2" $tu2 "" "" "" "" "+$qs3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
remove_acct "" "$nm1,$nm2,$nm3"
remove_user "" "" "$tu1,$tu2,$tu3"
remove_acct "" "$ta1,$ta2,$ta3"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
......@@ -254,21 +213,21 @@ if { $exit_code } {
# Use sacctmgr to list the test qos modifications
#
set matches 0
set my_pid [spawn $sacctmgr -n -p list user format="User,QosLevel" names=$us1,$us2,$us3 $was]
set my_pid [spawn $sacctmgr -n -p list user format="User,QosLevel" names=$tu1,$tu2,$tu3 withassoc]
expect {
-re "There was a problem" {
send_user "FAILURE: there was a problem with the sacctmgr command\n"
incr exit_code 1
}
-re "$us1.$qs3." {
-re "$tu1.$qs3." {
incr matches
exp_continue
}
-re "$us2.$qs2.$qs1.$qs3." {
-re "$tu2.$qs2.$qs1.$qs3." {
incr matches
exp_continue
}
-re "$us3.$qs2.$qs1." {
-re "$tu3.$qs2.$qs1." {
incr matches
exp_continue
}
......@@ -283,7 +242,7 @@ expect {
}
if {$matches != 15} {
send_user "\nFAILURE: Account addition 1 incorrect with only $matches.\n"
send_user "\nFAILURE: Account addition 15 incorrect with only $matches.\n"
incr exit_code 1
}
......@@ -292,10 +251,10 @@ if {$matches != 15} {
# account adminlevel cluster defaultaccount qoslevel name
# qoslevel waccounts wcluster wnames
#
incr exit_code [mod_user "$tc1,$tc2,$tc3" "$nm2" $us3 "" "" "" "" "-$qs2" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
incr exit_code [mod_user "$tc1,$tc2,$tc3" "$ta2" $tu3 "" "" "" "" "-$qs2" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
remove_acct "" "$nm1,$nm2,$nm3"
remove_user "" "" "$tu1,$tu2,$tu3"
remove_acct "" "$ta1,$ta2,$ta3"
remove_qos "$qs1,$qs2,$qs3"
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
......@@ -305,21 +264,21 @@ if { $exit_code } {
# Use sacctmgr to list the test qos modifications
#
set matches 0
set my_pid [spawn $sacctmgr -n -p list user format="User,QosLevel" names=$us1,$us2,$us3 $was]
set my_pid [spawn $sacctmgr -n -p list user format="User,QosLevel" names=$tu1,$tu2,$tu3 withassoc]
expect {
-re "There was a problem" {
send_user "FAILURE: there was a problem with the sacctmgr command\n"
incr exit_code 1
}
-re "$us1.$qs3." {
-re "$tu1.$qs3." {
incr matches
exp_continue
}
-re "$us2.$qs2.$qs1.$qs3." {
-re "$tu2.$qs2.$qs1.$qs3." {
incr matches
exp_continue
}
-re "$us3.$qs1." {
-re "$tu3.$qs1." {
incr matches
exp_continue
}
......@@ -334,19 +293,19 @@ expect {
}
if {$matches != 9} {
send_user "\nFAILURE: Account addition 1 incorrect with only $matches.\n"
send_user "\nFAILURE: Account addition 9 incorrect with only $matches.\n"
incr exit_code 1
}
# This is the end below here
incr exit_code [remove_user "" "" "$us1,$us2,$us3"]
incr exit_code [remove_acct "" "$nm1,$nm2,$nm3"]
incr exit_code [remove_user "" "" "$tu1,$tu2,$tu3"]
incr exit_code [remove_acct "" "$ta1,$ta2,$ta3"]
incr exit_code [remove_qos "$qs1,$qs2,$qs3"]
incr exit_code [remove_cluster "$tc1,$tc2,$tc3"]
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
print_success $test_id
} else {
send_user "\nFAILURE\n"
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung