From 1822eb230e086df8ca6bf8552d470d72e8abe75f Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 12 Dec 2005 22:53:12 +0000
Subject: [PATCH] Deal with messages coming out of order.

---
 testsuite/expect/test1.89 | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index 4d3a8e62c21..128039d5f90 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -133,10 +133,6 @@ expect {
 		incr task_mask $expect_out(2,string)
 		exp_continue
 	}
-	-re "setting affinity of task" {
-		incr verbose_cnt
-		exp_continue
-	}
 	-re "error" {
 		send_user "\nFAILURE: some error occurred\n"
 		set exit_code 1
@@ -152,6 +148,24 @@ if {$task_mask != $task_cnt} {
 	send_user "\nFAILURE: affinity mask inconsistent ($task_mask,$task_cnt)\n"
 	set exit_code 1
 }
+set verbose_cnt 0
+send "$srun -c1 --cpu_bind=verbose,map_cpu:0 $file_prog\n"
+expect {
+	-re "setting affinity of task" {
+		incr verbose_cnt
+		exp_continue
+	}
+	-re "error" {
+		send_user "\nFAILURE: some error occurred\n"
+		set exit_code 1
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: srun (from --allocate) not responding\n"
+		set exit_code 1
+	}
+	-re $prompt
+}
 if {$verbose_cnt != $task_cnt} {
 	send_user "\nFAILURE: verbose messages count inconsisent ($verbose_cnt,$task_cnt)\n"
 	set exit_code 1
-- 
GitLab