Skip to content

Commit d665c4b

Browse files
committed
test(main_admin): pass nil keyvizSampler in startAdminServer test callsites
Rebase residue: ee521be added the keyvizSampler parameter to startAdminServer; this updates the six test callsites that still pass the pre-rebase argument count.
1 parent c7ead4a commit d665c4b

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

main_admin_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func TestStartAdminServer_DisabledNoOp(t *testing.T) {
198198
eg, ctx := errgroup.WithContext(context.Background())
199199
defer func() { _ = eg.Wait() }()
200200
var lc net.ListenConfig
201-
_, err := startAdminServer(ctx, &lc, eg, adminListenerConfig{enabled: false}, nil, nil, nil, nil, nil, nil, "")
201+
_, err := startAdminServer(ctx, &lc, eg, adminListenerConfig{enabled: false}, nil, nil, nil, nil, nil, nil, nil, "")
202202
require.NoError(t, err)
203203
}
204204

@@ -211,7 +211,7 @@ func TestStartAdminServer_InvalidConfigRejected(t *testing.T) {
211211
listen: "127.0.0.1:0",
212212
// missing signing key
213213
}
214-
_, err := startAdminServer(ctx, &lc, eg, cfg, map[string]string{}, nil, nil, nil, nil, nil, "")
214+
_, err := startAdminServer(ctx, &lc, eg, cfg, map[string]string{}, nil, nil, nil, nil, nil, nil, "")
215215
require.Error(t, err)
216216
}
217217

@@ -224,7 +224,7 @@ func TestStartAdminServer_NonLoopbackWithoutTLSRejected(t *testing.T) {
224224
listen: "0.0.0.0:0",
225225
sessionSigningKey: freshKey(),
226226
}
227-
_, err := startAdminServer(ctx, &lc, eg, cfg, map[string]string{}, nil, nil, nil, nil, nil, "")
227+
_, err := startAdminServer(ctx, &lc, eg, cfg, map[string]string{}, nil, nil, nil, nil, nil, nil, "")
228228
require.Error(t, err)
229229
require.Contains(t, err.Error(), "TLS")
230230
}
@@ -238,7 +238,7 @@ func TestStartAdminServer_RejectsMissingClusterSource(t *testing.T) {
238238
listen: "127.0.0.1:0",
239239
sessionSigningKey: freshKey(),
240240
}
241-
_, err := startAdminServer(ctx, &lc, eg, cfg, map[string]string{}, nil, nil, nil, nil, nil, "")
241+
_, err := startAdminServer(ctx, &lc, eg, cfg, map[string]string{}, nil, nil, nil, nil, nil, nil, "")
242242
require.Error(t, err)
243243
require.Contains(t, err.Error(), "cluster info source")
244244
}
@@ -261,7 +261,7 @@ func TestStartAdminServer_ServesHealthz(t *testing.T) {
261261
cluster := admin.ClusterInfoFunc(func(_ context.Context) (admin.ClusterInfo, error) {
262262
return admin.ClusterInfo{NodeID: "n1", Version: "test"}, nil
263263
})
264-
addr, err := startAdminServer(eCtx, &lc, eg, cfg, map[string]string{}, cluster, nil, nil, nil, nil, "test")
264+
addr, err := startAdminServer(eCtx, &lc, eg, cfg, map[string]string{}, cluster, nil, nil, nil, nil, nil, "test")
265265
require.NoError(t, err)
266266

267267
// Poll /admin/healthz until success or the test deadline.
@@ -304,7 +304,7 @@ func TestStartAdminServer_ServesTLS(t *testing.T) {
304304
cluster := admin.ClusterInfoFunc(func(_ context.Context) (admin.ClusterInfo, error) {
305305
return admin.ClusterInfo{NodeID: "n-tls", Version: "test"}, nil
306306
})
307-
addr, err := startAdminServer(eCtx, &lc, eg, cfg, map[string]string{}, cluster, nil, nil, nil, nil, "test")
307+
addr, err := startAdminServer(eCtx, &lc, eg, cfg, map[string]string{}, cluster, nil, nil, nil, nil, nil, "test")
308308
require.NoError(t, err)
309309

310310
transport := &http.Transport{TLSClientConfig: &tls.Config{

0 commit comments

Comments
 (0)