From 6cee2899718b4f392d4bbe6541efb90eab1a072e Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 19 Nov 2008 16:50:19 +0000
Subject: [PATCH] svn merge -r15728:15732
https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
---
testsuite/expect/test1.32 | 2 ++
testsuite/expect/test15.23 | 5 -----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/testsuite/expect/test1.32 b/testsuite/expect/test1.32
index 437d14a853e..208f8b5ccdb 100755
--- a/testsuite/expect/test1.32
+++ b/testsuite/expect/test1.32
@@ -84,6 +84,8 @@ set srun_pid [spawn $srun -N1 -t1 --unbuffered $file_prog]
expect {
-re "WAITING" {
incr matches
+ # sleep to make sure the process is actually running
+ sleep 1
exec $bin_kill -USR1 $srun_pid
exec $bin_sleep 1
exec $bin_kill -USR2 $srun_pid
diff --git a/testsuite/expect/test15.23 b/testsuite/expect/test15.23
index fd29ab303f7..ac452e02cc6 100755
--- a/testsuite/expect/test15.23
+++ b/testsuite/expect/test15.23
@@ -39,11 +39,6 @@ set timeout $max_job_delay
print_header $test_id
-if {[test_assoc_enforced]} {
- send_user "\nWARNING: Using users default account instead of $job_acct since associations are enforced.\n"
- set job_acct [get_default_acct 0]
-}
-
#
# Set target environment variables
#
--
GitLab