Fix race when creating server

kylecarbs · kylecarbs · commit e54072a53a80 · 2022-10-16T01:30:09.000Z
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -170,9 +170,6 @@ func NewOptions(t *testing.T, options *Options) (*httptest.Server, context.Cance
 			Certificates: options.TLSCertificates,
 			MinVersion:   tls.VersionTLS12,
 		}
-		srv.StartTLS()
-	} else {
-		srv.Start()
 	}
 	t.Cleanup(srv.Close)
 
@@ -266,6 +263,11 @@ func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 	// We set the handler after server creation for the access URL.
 	coderAPI := coderd.New(newOptions)
 	srv.Config.Handler = coderAPI.RootHandler
+	if newOptions.TLSCertificates != nil {
+		srv.StartTLS()
+	} else {
+		srv.Start()
+	}
 	var provisionerCloser io.Closer = nopcloser{}
 	if options.IncludeProvisionerDaemon {
 		provisionerCloser = NewProvisionerDaemon(t, coderAPI)
diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go
@@ -77,6 +77,11 @@ func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 	})
 	assert.NoError(t, err)
 	srv.Config.Handler = coderAPI.AGPL.RootHandler
+	if oop.TLSCertificates != nil {
+		srv.StartTLS()
+	} else {
+		srv.Start()
+	}
 	var provisionerCloser io.Closer = nopcloser{}
 	if options.IncludeProvisionerDaemon {
 		provisionerCloser = coderdtest.NewProvisionerDaemon(t, coderAPI.AGPL)
