From 3bdf4189d9ada2a310dbc800d44bd011d5661b90 Mon Sep 17 00:00:00 2001
From: Jim Garlick <garlick.jim@gmail.com>
Date: Fri, 19 May 2023 07:38:40 -0700
Subject: [PATCH] fixup! testsuite: cover flub bootstrap

---
 t/t0034-flub.t | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/t/t0034-flub.t b/t/t0034-flub.t
index 3ae2255c2693..2ab0519369a8 100755
--- a/t/t0034-flub.t
+++ b/t/t0034-flub.t
@@ -28,7 +28,7 @@ test_expect_success 'job has size 1' '
 '
 test_expect_success 'flub bootstrap fails with no available ranks' '
 	test_must_fail flux broker \
-	    -Sbroker.boot-server=$(cat test1.uri) 2>noranks.err
+	    -Sbroker.boot-server=$(cat test1.uri) 2>noranks.err &&
 	grep "no available ranks" noranks.err
 '
 test_expect_success 'clean up' '
@@ -70,10 +70,15 @@ test_expect_success 'overlay status shows extra node offline' '
 	grep "2 extra0: offline" ov2.out
 '
 test_expect_success 'submit a job that starts the extra broker' '
-	flux submit -N1 flux broker \
+	id=$(flux submit -N1 flux broker \
 	    --config-path=fake2.toml \
 	    -Stbon.topo=kary:0 \
-	    -Sbroker.boot-server=$(cat test2.uri)
+	    -Sbroker.boot-server=$(cat test2.uri)) &&
+	flux job wait-event -p guest.exec.eventlog $id shell.start
+'
+test_expect_success 'wait for overlay status to be full' '
+	flux proxy $(cat test2.uri) \
+	    flux overlay status --wait full --timeout 10s
 '
 test_expect_success 'run a 3 node job in the expanded instance' '
 	run_timeout 30 flux proxy $(cat test2.uri) \
@@ -113,13 +118,18 @@ test_expect_success 'job has size 7' '
 	test $size -eq 7
 '
 test_expect_success 'submit a job that starts extra brokers' '
-	flux submit -N4 flux broker \
+	id=$(flux submit -N4 flux broker \
 	    --config-path=fake3.toml \
 	    -Stbon.topo=kary:2 \
-	    -Sbroker.boot-server=$(cat test3.uri)
+	    -Sbroker.boot-server=$(cat test3.uri)) &&
+	flux job wait-event -p guest.exec.eventlog $id shell.start
+'
+test_expect_success 'wait for overlay status to be full' '
+	flux proxy $(cat test3.uri) \
+	    flux overlay status --wait full --timeout 10s
 '
 test_expect_success 'run a 7 node job in the expanded instance' '
-	run_timeout 60 flux proxy $(cat test3.uri) \
+	run_timeout 30 flux proxy $(cat test3.uri) \
 	    flux run --label-io -N7 flux pmi barrier
 '
 test_expect_success 'clean up' '