From 76b8763ef74d4905c9a75ff9ae2179b1df99e8ab Mon Sep 17 00:00:00 2001 From: Easwar Swaminathan Date: Thu, 8 Dec 2022 16:37:41 -0800 Subject: [PATCH] post merge conflict fix --- test/xds/xds_security_config_nack_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/xds/xds_security_config_nack_test.go b/test/xds/xds_security_config_nack_test.go index f1421b6f7ab..2c5f5aea611 100644 --- a/test/xds/xds_security_config_nack_test.go +++ b/test/xds/xds_security_config_nack_test.go @@ -143,7 +143,7 @@ func (s) TestUnmarshalListener_WithUpdateValidatorFunc(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - managementServer, nodeID, bootstrapContents, resolver, cleanup1 := e2e.SetupManagementServer(t, nil) + managementServer, nodeID, bootstrapContents, resolver, cleanup1 := e2e.SetupManagementServer(t, e2e.ManagementServerOptions{}) defer cleanup1() lis, cleanup2 := setupGRPCServer(t, bootstrapContents)