diff --git a/testsuite/expect/test12.3 b/testsuite/expect/test12.3
index 2cf68529933dee0cf3e0ffabd99a71c34920da9a..523a30ff363370c234d7c869313e1344df18b81a 100755
--- a/testsuite/expect/test12.3
+++ b/testsuite/expect/test12.3
@@ -57,7 +57,7 @@ set exit_code 0
set matches 0
set not_support 0
send_user "sacct -$soption\n"
-set timeout 20
+set timeout 60
spawn $sacct -$soption
expect {
-re "SLURM accounting storage is disabled" {
diff --git a/testsuite/expect/test12.4 b/testsuite/expect/test12.4
index 699934b9e036fcf96fcbf8543d8f9966b69ce2ea..9f1b008bb4cd6e2c6a13c4983c75ea8a3a392ff0 100755
--- a/testsuite/expect/test12.4
+++ b/testsuite/expect/test12.4
@@ -203,17 +203,17 @@ proc sacct_job { soption job_id} {
set exit_code 0
set matches 0
set not_support 0
- send_user "sacct -$soption -j $job_id\n"
+ send_user "sacct -$soption -p -j $job_id\n"
if { $soption == "-brief" || $soption == "b" } {
- spawn $sacct -$soption -j $job_id
+ spawn $sacct -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
exp_continue
}
- -re "JobID......State......ExitCode" {
+ -re "JobID.State.ExitCode" {
if {$debug} {send_user "\nmatch1\n"}
incr matches
exp_continue
@@ -245,38 +245,38 @@ proc sacct_job { soption job_id} {
if { $soption == "-long" || $soption == "l" } {
- spawn $sacct -$soption -j $job_id
+ spawn $sacct -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
exp_continue
}
- -re "JobID......JobName....Partition..MaxVMSize" {
+ -re "JobID.JobName.Partition.MaxVMSize" {
if {$debug} {send_user "\nmatch3\n"}
incr matches
exp_continue
}
- -re "MaxVMSizeNode..MaxVMSizeTask..AveVMSize..MaxRSS" {
+ -re "MaxVMSizeNode.MaxVMSizeTask.AveVMSize.MaxRSS" {
if {$debug} {send_user "\nmatch4\n"}
incr matches
exp_continue
}
- -re "MaxRSSNode.MaxRSSTask.AveRSS.....MaxPages" {
+ -re "MaxRSSNode.MaxRSSTask.AveRSS.MaxPages" {
if {$debug} {send_user "\nmatch5\n"}
incr matches
exp_continue
}
- -re "MaxPagesNode.MaxPagesTask...AvePages...MinCPU" {
+ -re "MaxPagesNode.MaxPagesTask.AvePages.MinCPU" {
if {$debug} {send_user "\nmatch6\n"}
incr matches
exp_continue
}
- -re "MinCPUNode.MinCPUTask.AveCPU.....NTasks" {
+ -re "MinCPUNode.MinCPUTask.AveCPU.NTasks" {
if {$debug} {send_user "\nmatch7\n"}
incr matches
exp_continue
}
- -re "AllocCPUS..Elapsed....State......ExitCode" {
+ -re "AllocCPUS.Elapsed.State.ExitCode" {
if {$debug} {send_user "\nmatch8\n"}
incr matches
exp_continue
@@ -309,7 +309,7 @@ proc sacct_job { soption job_id} {
if { $soption == "-noheader" || $soption == "n" } {
- spawn $sacct -$soption -j $job_id
+ spawn $sacct -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
@@ -359,7 +359,7 @@ proc sacct_job { soption job_id} {
if { $soption == "-parsable" || $soption == "p" } {
- spawn $sacct -$soption -j $job_id
+ spawn $sacct -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
@@ -397,7 +397,7 @@ proc sacct_job { soption job_id} {
if { $soption == "-parsable2" || $soption == "P" } {
- spawn $sacct -$soption -j $job_id
+ spawn $sacct -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
@@ -436,7 +436,7 @@ proc sacct_job { soption job_id} {
if { $soption == "-verbose" || $soption == "v" } {
- spawn $sacct -$soption -j $job_id
+ spawn $sacct -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
@@ -447,12 +447,12 @@ proc sacct_job { soption job_id} {
incr matches
exp_continue
}
- -re "JobID......JobName....Partition" {
+ -re "JobID.JobName.Partition" {
if {$debug} {send_user "\nmatch17\n"}
incr matches
exp_continue
}
- -re "Account....AllocCPUS..State......ExitCode" {
+ -re "Account.AllocCPUS.State.ExitCode" {
if {$debug} {send_user "\nmatch18\n"}
incr matches
exp_continue
@@ -503,22 +503,22 @@ proc sacct_vargs { soption vargs job_id} {
set exit_code 0
set matches 0
set not_support 0
- send_user "sacct -$soption $vargs -j $job_id\n"
+ send_user "sacct -$soption $vargs -p -j $job_id\n"
if { $soption == "g" || $soption == "-gid" || $soption == "-group" || $soption == "u" || $soption == "-uid" || $soption == "-user"} {
- spawn $sacct -$soption $vargs -j $job_id
+ spawn $sacct -$soption $vargs -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
exp_continue
}
- -re "JobID......JobName....Partition" {
+ -re "JobID.JobName.Partition" {
if {$debug} {send_user "\nmatch20\n"}
incr matches
exp_continue
}
- -re "Account....AllocCPUS..State......ExitCode" {
+ -re "Account.AllocCPUS.State.ExitCode" {
if {$debug} {send_user "\nmatch21\n"}
incr matches
exp_continue
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index 0af87c6b1b65d837bfccf4f756c743befa114e54..0f7a2e26ff92e1ea830c7a26fb38f61511be6018 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -55,7 +55,7 @@ set cluster_cpus [expr $node0_cpus + $node1_cpus]
set access_err 0
set uid [get_my_uid]
set gid [get_my_gid]
-set timeout 60
+set timeout 120
print_header $test_id
diff --git a/testsuite/expect/test23.3 b/testsuite/expect/test23.3
index c9439726b40d6b92b3cf426611cd15bf98ce0251..67080abddbeaa85671c42735d8c6546fa868e257 100755
--- a/testsuite/expect/test23.3
+++ b/testsuite/expect/test23.3
@@ -255,11 +255,11 @@ proc sstat_job { soption job_id} {
set exit_code 0
set matches 0
set not_support 0
- send_user "sstat -$soption -j $job_id\n"
+ send_user "sstat -$soption -p -j $job_id\n"
if { $soption == "-allsteps" || $soption == "a" } {
- spawn $sstat -$soption -j $job_id
+ spawn $sstat -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
@@ -302,7 +302,7 @@ proc sstat_job { soption job_id} {
if { $soption == "-noheader" || $soption == "n" } {
- spawn $sstat -$soption -j $job_id
+ spawn $sstat -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
@@ -343,7 +343,7 @@ proc sstat_job { soption job_id} {
if { $soption == "-parsable" || $soption == "p" } {
- spawn $sstat -$soption -j $job_id
+ spawn $sstat -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
@@ -439,23 +439,23 @@ proc sstat_job { soption job_id} {
if { $soption == "-verbose" || $soption == "v" } {
- spawn $sstat -$soption -j $job_id
+ spawn $sstat -$soption -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
exp_continue
}
- -re "JobID......MaxVMSize..MaxVMSizeNode..MaxVMSizeTask..AveVMSize..MaxRSS" {
+ -re "JobID.MaxVMSize.MaxVMSizeNode.MaxVMSizeTask.AveVMSize.MaxRSS" {
if {$debug} {send_user "\nmatch14\n"}
incr matches
exp_continue
}
- -re "MaxRSSNode.MaxRSSTask.AveRSS.....MaxPages.MaxPagesNode.MaxPagesTask" {
+ -re "MaxRSSNode.MaxRSSTask.AveRSS.MaxPages.MaxPagesNode.MaxPagesTask" {
if {$debug} {send_user "\nmatch15\n"}
incr matches
exp_continue
}
- -re "AvePages...MinCPU.....MinCPUNode.MinCPUTask.AveCPU.....NTasks" {
+ -re "AvePages.MinCPU.MinCPUNode.MinCPUTask.AveCPU.NTasks" {
if {$debug} {send_user "\nmatch16\n"}
incr matches
exp_continue
@@ -506,37 +506,37 @@ proc sstat_vargs { soption vargs job_id} {
set exit_code 0
set matches 0
set not_support 0
- send_user "sstat -$soption $vargs -j $job_id\n"
+ send_user "sstat -$soption $vargs -p -j $job_id\n"
if { $soption == "o" || $soption == "-format" } {
- spawn $sstat -$soption $vargs -j $job_id
+ spawn $sstat -$soption $vargs -p -j $job_id
expect {
-re "SLURM accounting storage is disabled" {
set not_support 1
exp_continue
}
- -re "AveCPU.....AvePages...AveRSS.....AveVMSize" {
+ -re "AveCPU.AvePages.AveRSS.AveVMSize" {
if {$debug} {send_user "\nmatch18\n"}
incr matches
exp_continue
}
- -re "JobID......MaxPages.MaxPagesNode.MaxPagesTask" {
+ -re "JobID.MaxPages.MaxPagesNode.MaxPagesTask" {
if {$debug} {send_user "\nmatch19\n"}
incr matches
exp_continue
}
- -re "MaxRSS.....MaxRSSNode.MaxRSSTask.MaxVMSize" {
+ -re "MaxRSS.MaxRSSNode.MaxRSSTask.MaxVMSize" {
if {$debug} {send_user "\nmatch20\n"}
incr matches
exp_continue
}
- -re "MaxVMSizeNode..MaxVMSizeTask..MinCPU.....MinCPUNode" {
+ -re "MaxVMSizeNode.MaxVMSizeTask.MinCPU.MinCPUNode" {
if {$debug} {send_user "\nmatch21\n"}
incr matches
exp_continue
}
- -re "MinCPUTask.NTasks...SystemCPU..TotalCPU" {
+ -re "MinCPUTask.NTasks.SystemCPU.TotalCPU" {
if {$debug} {send_user "\nmatch22\n"}
incr matches
exp_continue