From 0cca4c088dcc77751f6eebf869fe9c7084491798 Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <4903+rboyer@users.noreply.github.com>
Date: Tue, 18 Oct 2022 10:51:20 -0500
Subject: [PATCH] test: possibly fix flake in TestIntentionGetExact (#15021)

Restructure test setup to be similar to TestAgent_ServerCertificate
and see if that's enough to avoid flaking after join.
---
 agent/intentions_endpoint_test.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/agent/intentions_endpoint_test.go b/agent/intentions_endpoint_test.go
index 148e48f8fb..ff17297fc5 100644
--- a/agent/intentions_endpoint_test.go
+++ b/agent/intentions_endpoint_test.go
@@ -407,22 +407,22 @@ func TestIntentionGetExact(t *testing.T) {
 
 	t.Parallel()
 
-	hcl := `
-	bootstrap = false
-	bootstrap_expect = 2
-	server = true
-	`
-
-	a1 := NewTestAgent(t, hcl)
-	a2 := NewTestAgent(t, hcl)
-
-	_, err := a1.JoinLAN([]string{
-		fmt.Sprintf("127.0.0.1:%d", a2.Config.SerfPortLAN),
-	}, nil)
+	a1 := NewTestAgent(t, `
+		bootstrap = true
+		server = true
+	`)
+	testrpc.WaitForTestAgent(t, a1.RPC, "dc1")
+
+	a2 := NewTestAgent(t, `
+		bootstrap = false
+		server = true
+	`)
+
+	_, err := a2.JoinLAN([]string{fmt.Sprintf("127.0.0.1:%d", a1.Config.SerfPortLAN)}, nil)
 	require.NoError(t, err)
 
-	testrpc.WaitForTestAgent(t, a1.RPC, "dc1")
 	testrpc.WaitForTestAgent(t, a2.RPC, "dc1")
+
 	testrpc.WaitForLeader(t, a1.RPC, "dc1")
 	testrpc.WaitForLeader(t, a2.RPC, "dc1")