From 0090f76887d92796acbc6ef54770e8b8734e0e32 Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 29 Sep 2023 17:37:42 -0400 Subject: [PATCH] fixup! test: fixup some racing tests --- server_test.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/server_test.go b/server_test.go index 9b29afd..61d9c4a 100644 --- a/server_test.go +++ b/server_test.go @@ -2,6 +2,7 @@ package gldap_test import ( "crypto/tls" + "crypto/x509" "fmt" "sync" "testing" @@ -167,10 +168,18 @@ func TestServer_shutdownCtx(t *testing.T) { td := testdirectory.Start(fakeT, testdirectory.WithDefaults(t, &testdirectory.Defaults{AllowAnonymousBind: true})) time.Sleep(1 * time.Second) // allow time so the test directory will start up. go func() { - client := td.Conn() - defer client.Close() + certpool := x509.NewCertPool() + certpool.AppendCertsFromPEM([]byte(td.Cert())) + tlsConfig := &tls.Config{ + RootCAs: certpool, + } + conn, err := ldap.DialURL(fmt.Sprintf("ldaps://localhost:%d", td.Port()), ldap.DialWithTLSConfig(tlsConfig)) + if err != nil { + return + } + defer conn.Close() for { - err := client.UnauthenticatedBind("alice") + err := conn.UnauthenticatedBind("alice") if err != nil { return }