diff --git a/testsuite/expect/inc22.1.1 b/testsuite/expect/inc22.1.1
index e7b729bcdfaae3a667b0f5a08af63e8afc7053bd..5a9b970262f2ddf7b3586fd8489f3a94c29d792c 100644
--- a/testsuite/expect/inc22.1.1
+++ b/testsuite/expect/inc22.1.1
@@ -42,10 +42,13 @@ proc inc22_1_1 {} {
global exit_code wc_key_track wckey1 sql_rem
# Mon Dec 31 23:00:00 2007
- set period_start 1199170800
+ set start_time "Mon Dec 31 23:00:00 2007"
+ set period_start [exec date +%s --date=$start_time]
# Tue Jan 1 00:00:00 2008
- set period_end 1199174400
+ set end_time "Tue Jan 1 00:00:00 2008"
+ set period_end [exec date +%s --date=$end_time]
+
set start_str [timestamp -format %Y-%m-%dT%X -seconds $period_start]
set end_str [timestamp -format %Y-%m-%dT%X -seconds $period_end]
set reported [expr ($period_end - $period_start) * $cluster_cpus]
diff --git a/testsuite/expect/inc22.1.2 b/testsuite/expect/inc22.1.2
index 1083cb388ceafaada063afeadcfac88972744e10..3c5ddc268982f995c656011ad73656d6598f9638 100644
--- a/testsuite/expect/inc22.1.2
+++ b/testsuite/expect/inc22.1.2
@@ -40,13 +40,16 @@ proc inc22_1_2 {} {
global node0_down_end node0_cpus node1_cpus cluster sreport
global my_pid accounts users cluster_cpus
global job1_end job1_cpus job2_elig job2_cpus account1 user1
- global wckey1 wc_key_track exit_code
+ global sql_rem wckey1 wc_key_track exit_code
# Tue Jan 1 00:00:00 2008
- set period_start 1199174400
+ set start_time "Tue Jan 1 00:00:00 2008"
+ set period_start [exec date +%s --date=$start_time]
# Tue Jan 1 01:00:00 2008
- set period_end 1199178000
+ set end_time "Tue Jan 1 01:00:00 2008"
+ set period_end [exec date +%s --date=$end_time]
+
set start_str [timestamp -format %Y-%m-%dT%X -seconds $period_start]
set end_str [timestamp -format %Y-%m-%dT%X -seconds $period_end]
@@ -71,7 +74,7 @@ proc inc22_1_2 {} {
set idle [format "%d\\\(%.2f%%\\\)" $idle [expr double($idle * 100)/$reported]]
set reported [format "%d\\\(%.2f%%\\\)" $reported 100]
- send_user "\nTesting sreport for second hour\n"
+ send_user "\nTesting sreport for second hour (Within: inc22.1.2)\n"
set matches 0
set my_pid [eval spawn $sreport cluster utilization cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,idle,down,alloc,res,reported]
expect {
@@ -94,8 +97,8 @@ proc inc22_1_2 {} {
}
if {$matches != 1} {
- send_user "\nFAILURE: sreport didn't give good info 9 $matches. (Within: inc21.1.2)\n"
- send_user "we are looking for $cluster.$idle.$down.$alloc.$resv.$reported. (Within inc21.1.2)\n"
+ send_user "\nFAILURE: sreport didn't give good info 9 $matches. (Within: inc22.1.2)\n"
+ send_user "we are looking for $cluster.$idle.$down.$alloc.$resv.$reported. (Within inc22.1.2)\n"
incr exit_code 1
}
@@ -112,7 +115,7 @@ proc inc22_1_2 {} {
set my_pid [eval spawn $sreport cluster AccountUtilizationByUser cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,account,login,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.2)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.2)\n"
incr exit_code 1
}
-re "$cluster.root..$alloc." {
@@ -128,7 +131,7 @@ proc inc22_1_2 {} {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.2)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -138,7 +141,7 @@ proc inc22_1_2 {} {
}
if {$matches != 3} {
- send_user "\nFAILURE: sreport didn't give good info 11. (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sreport didn't give good info 11. (Within: inc22.1.2)\n"
incr exit_code 1
}
@@ -155,7 +158,7 @@ proc inc22_1_2 {} {
set my_pid [eval spawn $sreport cluster UserUtilizationByWckey cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,login,wckey,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.2)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.2)\n"
incr exit_code 1
}
-re "$cluster.$user1.$wckey1.$alloc." {
@@ -163,7 +166,7 @@ proc inc22_1_2 {} {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.2)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -173,7 +176,7 @@ proc inc22_1_2 {} {
}
if {$wc_key_track == 1 && $matches != 1} {
- send_user "\nFAILURE: sreport didn't give good info 12. (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sreport didn't give good info 12. (Within: inc22.1.2)\n"
incr exit_code 1
}
@@ -190,7 +193,7 @@ proc inc22_1_2 {} {
set my_pid [eval spawn $sreport cluster WckeyUtilizationByUser cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,wckey,login,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.2)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.2)\n"
incr exit_code 1
}
-re "$cluster.$wckey1..$alloc." {
@@ -202,7 +205,7 @@ proc inc22_1_2 {} {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.2)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -212,7 +215,7 @@ proc inc22_1_2 {} {
}
if {$wc_key_track == 1 && $matches != 2} {
- send_user "\nFAILURE: sreport didn't give good info 13. (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sreport didn't give good info 13. (Within: inc22.1.2)\n"
incr exit_code 1
}
@@ -229,7 +232,7 @@ proc inc22_1_2 {} {
set my_pid [eval spawn $sreport user top cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,account,login,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.2)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.2)\n"
incr exit_code 1
}
-re "$cluster.$account1.$user1.$alloc." {
@@ -237,7 +240,7 @@ proc inc22_1_2 {} {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.2)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -247,7 +250,7 @@ proc inc22_1_2 {} {
}
if {$matches != 1} {
- send_user "\nFAILURE: sreport didn't give good info 14. (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sreport didn't give good info 14. (Within: inc22.1.2)\n"
incr exit_code 1
}
@@ -264,7 +267,7 @@ proc inc22_1_2 {} {
set my_pid [eval spawn $sreport job size grouping=2,4 cluster='$cluster' start=$start_str end=$end_str -tsec -p -n]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.2)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.2)\n"
incr exit_code 1
}
-re "$cluster.$account1.0.$alloc_sec.0." {
@@ -272,7 +275,7 @@ proc inc22_1_2 {} {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.2)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -282,7 +285,7 @@ proc inc22_1_2 {} {
}
if {$matches != 1} {
- send_user "\nFAILURE: sreport didn't give good info 15 $matches. (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sreport didn't give good info 15 $matches. (Within: inc22.1.2)\n"
incr exit_code 1
}
@@ -299,7 +302,7 @@ proc inc22_1_2 {} {
set my_pid [eval spawn $sreport job sizesbywckey grouping=2,4 cluster='$cluster' start=$start_str end=$end_str -tsec -p -n]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.2)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.2)\n"
incr exit_code 1
}
-re "$cluster.$wckey1.0.$wckey_alloc_sec.0." {
@@ -307,7 +310,7 @@ proc inc22_1_2 {} {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.2)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -317,7 +320,7 @@ proc inc22_1_2 {} {
}
if {$matches != 1} {
- send_user "\nFAILURE: sreport didn't give good info 16 $matches. (Within: inc21.1.2)\n"
+ send_user "\nFAILURE: sreport didn't give good info 16 $matches. (Within: inc22.1.2)\n"
incr exit_code 1
}
diff --git a/testsuite/expect/inc22.1.3 b/testsuite/expect/inc22.1.3
index e5b0e3caa89542fa3c6c10ea928d2432b7684104..fd8e7c480dc0414d671b532da567b116ae571f55 100644
--- a/testsuite/expect/inc22.1.3
+++ b/testsuite/expect/inc22.1.3
@@ -44,13 +44,16 @@ proc inc22_1_3 { } {
global job3_end job3_cpus job3_alloc job3_elig acct1_alloc acct2_alloc
global acct3_alloc total_alloc wckey1_alloc user1_wckey1_alloc
global user2_wckey1_alloc user1 user2 account1 account2 account3
- global wckey1 wc_key_track
+ global sql_rem wckey1 wc_key_track
# Mon Dec 31 23:00:00 2007
- set period_start 1199170800
+ set start_time "Mon Dec 31 23:00:00 2007"
+ set period_start [exec date +%s --date=$start_time]
# Tue Jan 3 00:00:00 2008
- set period_end 1199347200
+ set end_time "Tue Jan 3 00:00:00 2008"
+ set period_end [exec date +%s --date=$end_time]
+
set start_str [timestamp -format %Y-%m-%dT%X -seconds $period_start]
set end_str [timestamp -format %Y-%m-%dT%X -seconds $period_end]
@@ -96,12 +99,12 @@ proc inc22_1_3 { } {
set reported [format "%d\\\(%.2f%%\\\)" $reported 100]
- send_user "\nTesting sreport for 3 days (Within: inc21.1.3)\n"
+ send_user "\nTesting sreport for 3 days (Within: inc22.1.3)\n"
set matches 0
set my_pid [eval spawn $sreport cluster utilization cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,idle,down,alloc,res,over,reported]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.$idle.$down.$alloc.$resv.$over.$reported." {
@@ -109,7 +112,7 @@ proc inc22_1_3 { } {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.3)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -119,8 +122,8 @@ proc inc22_1_3 { } {
}
if {$matches != 1} {
- send_user "\nFAILURE: sreport didn't give good info 17 $matches. (Within: inc21.1.2)\n"
- send_user "we are looking for $cluster.$idle.$down.$alloc.$resv.$over.$reported. (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sreport didn't give good info 17 $matches. (Within: inc22.1.3)\n"
+ send_user "we are looking for $cluster.$idle.$down.$alloc.$resv.$over.$reported. (Within: inc22.1.3)\n"
incr exit_code 1
}
@@ -137,7 +140,7 @@ proc inc22_1_3 { } {
set my_pid [eval spawn $sreport cluster UserUtilizationByAccount cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,login,account,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.$user2.$account3.$job2_alloc_str." {
@@ -156,7 +159,7 @@ proc inc22_1_3 { } {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.3)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -166,7 +169,7 @@ proc inc22_1_3 { } {
}
if {$matches != 3} {
- send_user "\nFAILURE: sreport didn't give good info 18 $matches. (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sreport didn't give good info 18 $matches. (Within: inc22.1.3)\n"
incr exit_code 1
}
@@ -183,7 +186,7 @@ proc inc22_1_3 { } {
set my_pid [eval spawn $sreport cluster AccountUtilizationByUser cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,account,login,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.root..$total_alloc_str." {
@@ -215,7 +218,7 @@ proc inc22_1_3 { } {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.3)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -225,7 +228,7 @@ proc inc22_1_3 { } {
}
if {$matches != 7} {
- send_user "\nFAILURE: sreport didn't give good info 19 $matches. (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sreport didn't give good info 19 $matches. (Within: inc22.1.3)\n"
incr exit_code 1
}
@@ -242,7 +245,7 @@ proc inc22_1_3 { } {
set my_pid [eval spawn $sreport cluster UserUtilizationByWckey cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,login,wckey,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.$user2.$wckey1.$user2_wckey1_alloc_str." {
@@ -266,7 +269,7 @@ proc inc22_1_3 { } {
}
if {$wc_key_track == 1 && $matches != 2} {
- send_user "\nFAILURE: sreport didn't give good info 20 $matches. (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sreport didn't give good info 20 $matches. (Within: inc22.1.3)\n"
incr exit_code 1
}
@@ -283,7 +286,7 @@ proc inc22_1_3 { } {
set my_pid [eval spawn $sreport cluster WckeyUtilizationByUser cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,wckey,login,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.$wckey1..$wckey1_alloc_str." {
@@ -299,7 +302,7 @@ proc inc22_1_3 { } {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.3)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -309,7 +312,7 @@ proc inc22_1_3 { } {
}
if {$wc_key_track == 1 && $matches != 3} {
- send_user "\nFAILURE: sreport didn't give good info 21 $matches. (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sreport didn't give good info 21 $matches. (Within: inc22.1.3)\n"
incr exit_code 1
}
@@ -326,7 +329,7 @@ proc inc22_1_3 { } {
set my_pid [eval spawn $sreport user top cluster='$cluster' start=$start_str end=$end_str -tsecper -p -n format=cluster,account,login,used]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.$account3.$user2.$job2_alloc_str." {
@@ -342,7 +345,7 @@ proc inc22_1_3 { } {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.3)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -352,7 +355,7 @@ proc inc22_1_3 { } {
}
if {$matches != 3} {
- send_user "\nFAILURE: sreport didn't give good info 22 $matches. (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sreport didn't give good info 22 $matches. (Within: inc22.1.3)\n"
incr exit_code 1
}
@@ -369,7 +372,7 @@ proc inc22_1_3 { } {
set my_pid [eval spawn $sreport job size grouping=2,4 cluster='$cluster' start=$start_str end=$end_str -tsec -p -n]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.$account1.0.$job1_alloc.0." {
@@ -381,7 +384,7 @@ proc inc22_1_3 { } {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.3)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -391,7 +394,7 @@ proc inc22_1_3 { } {
}
if {$matches != 2} {
- send_user "\nFAILURE: sreport didn't give good info 23 $matches. (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sreport didn't give good info 23 $matches. (Within: inc22.1.3)\n"
incr exit_code 1
}
@@ -408,7 +411,7 @@ proc inc22_1_3 { } {
set my_pid [eval spawn $sreport job size grouping=2,4 cluster='$cluster' account='$account2' start=$start_str end=$end_str -tsec -p -n]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.$account3.0.0.$job2_alloc." {
@@ -416,7 +419,7 @@ proc inc22_1_3 { } {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sacctmgr archive load not responding (Within: inc22.1.3)\n"
slow_kill $my_pid
incr exit_code 1
}
@@ -426,7 +429,7 @@ proc inc22_1_3 { } {
}
if {$matches != 1} {
- send_user "\nFAILURE: sreport didn't give good info 24 $matches. (Within: inc21.1.3)\n"
+ send_user "\nFAILURE: sreport didn't give good info 24 $matches. (Within: inc22.1.3)\n"
incr exit_code 1
}
@@ -443,7 +446,7 @@ proc inc22_1_3 { } {
set my_pid [eval spawn $sreport job sizesbywckey grouping=2,4 cluster='$cluster' start=$start_str end=$end_str -tsec -p -n]
expect {
-re "There was a problem" {
- send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc21.1.3)\n"
+ send_user "FAILURE: there was a problem with the sacctmgr command (Within: inc22.1.3)\n"
incr exit_code 1
}
-re "$cluster.$wckey1.0.$wckey_alloc_sec1.$wckey_alloc_sec2." {
@@ -451,7 +454,7 @@ proc inc22_1_3 { } {
exp_continue
}
timeout {
- send_user "\nFAILURE: sacctmgr archive load not responding\n (Within: inc21.1.3)"
+ send_user "\nFAILURE: sacctmgr archive load not responding\n (Within: inc22.1.3)"
slow_kill $my_pid
incr exit_code 1
}
diff --git a/testsuite/expect/test1.35 b/testsuite/expect/test1.35
index 6bff0eb17578cc22f2e50b943697f8b2845c593c..e8f93183df1293c440ed2c71f369057b40e71e6d 100755
--- a/testsuite/expect/test1.35
+++ b/testsuite/expect/test1.35
@@ -58,7 +58,7 @@ set step_mem_opt "--comment=no_mem"
spawn -noecho $bin_bash -c "exec $scontrol show config | $bin_grep SelectTypeParameters"
expect {
-re "MEMORY" {
- set job_mem_opt "--mem-per-cpu=64"
+ set job_mem_opt "--mem-per-cpu=256"
set step_mem_opt "--mem-per-cpu=2"
exp_continue
}
@@ -102,7 +102,7 @@ if { [test_xcpu] } {
set srun_pid [spawn $sbatch -N$node_cnt --output=$file_out --error=$file_err -t1 $job_mem_opt $file_in]
expect {
-re "Requested node configuration is not available" {
- send_user "\nFAILURE: Memory is allocated, but your nodes don't have even 32MB configured\n"
+ send_user "\nFAILURE: Memory is allocated, but your nodes don't have even 256MB configured\n"
set exit_code 1
}
-re "Submitted batch job ($number)" {
diff --git a/testsuite/expect/test1.84 b/testsuite/expect/test1.84
index 7250902020a4966cd89f8c0f96066b2eb93c7a80..7d0f6fc8de894bb9ecfbbcf34d8e9df4f4b8ad0a 100755
--- a/testsuite/expect/test1.84
+++ b/testsuite/expect/test1.84
@@ -121,7 +121,7 @@ sleep 2
set fd [open "|$scontrol --oneliner show node $def_hostlist"]
exp_internal 1
while {[gets $fd line] != -1} {
- if {[regexp {NodeName=(\w+).*CPUTot=(\d+)(K?).*State=IDLE ThreadsPerCore=(\d+)} $line frag host cpu_cnt units threads_per_core] == 1} {
+ if {[regexp {NodeName=([^\s]+).*CPUTot=(\d+)(K?).*State=IDLE ThreadsPerCore=(\d+)} $line frag host cpu_cnt units threads_per_core] == 1} {
break
}
}
diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index 46284a7a211ed71e89da47b69a6b949239a290f6..43638a41fe5bb1b077a05a5c68253be224467406 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -266,7 +266,7 @@ make_bash_script $file_in "
#
set config_prob 0
set timeout [expr $max_job_delay + $sleep_time]
-set job_mem_limit [expr ($mem_size + $max_mem_error) / 1024 + 4]
+set job_mem_limit [expr ($mem_size + $max_mem_error) / 1024 + 10]
set sbatch_pid [spawn $sbatch --mem-per-cpu=$job_mem_limit --output=$file_out --error=$file_err -t2 $file_in]
expect {
-re "Requested node configuration is not available" {
diff --git a/testsuite/expect/test21.30 b/testsuite/expect/test21.30
index 333848d80223166d107147a920725fb457d530b1..2741397dc3244e7d4c315fb3a3bd186ff05e5747 100755
--- a/testsuite/expect/test21.30
+++ b/testsuite/expect/test21.30
@@ -206,6 +206,10 @@ if { [test_limits_enforced] == 0 } {
send_user "\nWARNING: This test can't be run without enforcing limits\n"
exit 0
}
+if {[test_super_user] == 0} {
+ send_user "\nWARNING Test can only be ran as SlurmUser\n"
+ exit 0
+}
#
# Some tests will not work properly when allocating whole nodes to jobs
diff --git a/testsuite/expect/test21.31 b/testsuite/expect/test21.31
index 7361bd66fa5df4162643a07227eaa2c9193286c7..7f74303e1b5f017acae9d3e925627f83261d5b9e 100755
--- a/testsuite/expect/test21.31
+++ b/testsuite/expect/test21.31
@@ -68,6 +68,14 @@ if { [test_account_storage] == 0 } {
exit 0
}
+#
+# Check that current user is root or SlurmUser
+#
+if {[test_super_user] == 0} {
+ send_user "\nWARNING: Test can only be ran as SlurmUser\n"
+ exit 0
+}
+
#if { [string compare [check_accounting_admin_level] "Administrator"] } {
# send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
# exit 0
diff --git a/testsuite/expect/test21.32 b/testsuite/expect/test21.32
index 26de344f205f5ae09fc73e3bbf1977ba90b3c1b3..fdd39ea907672ed5b37812a22e5e33fcbde70ba0 100755
--- a/testsuite/expect/test21.32
+++ b/testsuite/expect/test21.32
@@ -134,6 +134,14 @@ proc check_pre { preempt_qos } {
######################### Test Begins #########################
+#
+# Check that current user is root or SlurmUser
+#
+if {[test_super_user] == 0} {
+ send_user "\nWARNING: Test can only be ran as SlurmUser\n"
+ exit 0
+}
+
# clean it up (and check to make sure we can do this test
remove_qos $qos_names_str
if {$access_err != 0} {
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index acd6be803cf68d0006e56533e89268af40abb964..7d079932f2ea7590eb732da9fabe6d0b0e7e2243 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -69,12 +69,16 @@ set timeout 120
print_header $test_id
# Fri Thu Jan 31 00:00:00 2008 - Needed only for the 00:00:00 for timing purposes
-set midnight 1201766400
-
+set midnight_time "Thu Jan 31 00:00:00 2008"
+set midnight [exec date +%s --date=$midnight_time]
+
# Mon Dec 31 23:00:00 2007
-set period_start 1199170800
+set start_date "Mon Dec 31 23:00:00 2007"
+set period_start [exec date +%s --date=$start_date]
+
# Thu Jan 31 23:59:59 2008
-set period_end 1201852799
+set end_date "Thu Jan 31 23:59:59 2008"
+set period_end [exec date +%s --date=$end_date]
set start_str [timestamp -format %Y-%m-%dT%X -seconds $period_start]
set end_str [timestamp -format %Y-%m-%dT%X -seconds $period_end]