Backport of fix test flake for RPC TLS enforcement test into release/…

…1.4.x (#16203) This pull request was automerged via backport-assistant
hashicorp · Feb 16, 2023 · 168d5c7 · 168d5c7
1 parent 7cc33ab
commit 168d5c7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/nomad/rpc_test.go b/nomad/rpc_test.go
@@ -1119,7 +1119,7 @@ func TestRPC_TLS_Enforcement_RPC(t *testing.T) {
 	defer tlsHelper.cleanup()
 
 	standardRPCs := map[string]interface{}{
-		"Status.Ping": struct{}{},
+		"Status.Ping": &structs.GenericRequest{},
 	}
 
 	localServersOnlyRPCs := map[string]interface{}{
@@ -1377,6 +1377,7 @@ func newTLSTestHelper(t *testing.T) tlsTestHelper {
 			KeyFile:              h.serverCert + ".key",
 		}
 	})
+	testutil.WaitForLeader(t, h.nonVerifyServer.RPC)
 
 	return h
 }