Cleanup some tests + GetTLSConnectionState() race fix

server/accounts_test.go

@@ -3278,6 +3278,7 @@ func TestAccountSystemPermsWithGlobalAccess(t *testing.T) {
 	defer removeFile(t, conf)
 
 	s, _ := RunServerWithConfig(conf)
+	defer s.Shutdown()
 
 	// Make sure we can connect with no auth to global account as normal.
 	nc, err := nats.Connect(s.ClientURL())

server/client.go

@@ -445,6 +445,11 @@ func (c *client) GetOpts() *clientOpts {
 // GetTLSConnectionState returns the TLS ConnectionState if TLS is enabled, nil
 // otherwise. Implements the ClientAuth interface.
 func (c *client) GetTLSConnectionState() *tls.ConnectionState {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if c.nc == nil {
+		return nil
+	}
 	tc, ok := c.nc.(*tls.Conn)
 	if !ok {
 		return nil

server/jetstream_cluster_test.go

@@ -6172,6 +6172,7 @@ func createJetStreamClusterExplicit(t *testing.T, clusterName string, numServers
 }
 
 func createJetStreamClusterWithTemplate(t *testing.T, tmpl string, clusterName string, numServers int) *cluster {
+	t.Helper()
 	const startClusterPort = 22332
 	return createJetStreamCluster(t, tmpl, clusterName, _EMPTY_, numServers, startClusterPort, true)
 }

server/jetstream_test.go

@@ -9103,6 +9103,7 @@ func TestJetStreamPushConsumersPullError(t *testing.T) {
 	}
 
 	nc, js := jsClientConnect(t, s)
+	defer nc.Close()
 
 	if _, err := js.AddStream(&nats.StreamConfig{Name: "TEST"}); err != nil {
 		t.Fatalf("Unexpected error: %v", err)

server/jwt_test.go

@@ -5545,7 +5545,9 @@ func TestJWTAccountProtectedImport(t *testing.T) {
 		s, _ := RunServerWithConfig(cf)
 		defer s.Shutdown()
 		ncExp := natsConnect(t, s.ClientURL(), createUserCreds(t, s, exportKp))
+		defer ncExp.Close()
 		ncImp := natsConnect(t, s.ClientURL(), createUserCreds(t, s, importKp))
+		defer ncImp.Close()
 		t.Run("service", func(t *testing.T) {
 			sub, err := ncExp.Subscribe("service.*", func(msg *nats.Msg) {
 				msg.Respond([]byte("world"))
@@ -5580,7 +5582,9 @@ func TestJWTAccountProtectedImport(t *testing.T) {
 		s, _ := RunServerWithConfig(cf)
 		defer s.Shutdown()
 		ncExp := natsConnect(t, s.ClientURL(), createUserCreds(t, s, exportKp))
+		defer ncExp.Close()
 		ncImp := natsConnect(t, s.ClientURL(), createUserCreds(t, s, importKp))
+		defer ncImp.Close()
 		t.Run("service", func(t *testing.T) {
 			sub, err := ncExp.Subscribe("service.*", func(msg *nats.Msg) {
 				msg.Respond([]byte("world"))
@@ -5635,7 +5639,9 @@ func TestJWTAccountProtectedImport(t *testing.T) {
 		updateJwt(t, s.ClientURL(), sysUsrCreds, importJWT, 1)
 		updateJwt(t, s.ClientURL(), sysUsrCreds, exportJWTOff, 1)
 		ncExp := natsConnect(t, s.ClientURL(), createUserCreds(t, s, exportKp))
+		defer ncExp.Close()
 		ncImp := natsConnect(t, s.ClientURL(), createUserCreds(t, s, importKp))
+		defer ncImp.Close()
 		msgChan := make(chan *nats.Msg, 4)
 		defer close(msgChan)
 		// ensure service passes

server/leafnode_test.go

@@ -2657,6 +2657,7 @@ func TestLeafNodeWSBasic(t *testing.T) {
 			checkSubInterest(t, ln, globalAccountName, "foo", time.Second)
 
 			nc2 := natsConnect(t, ln.ClientURL())
+			defer nc2.Close()
 			msg1Payload := make([]byte, 512)
 			for i := 0; i < len(msg1Payload); i++ {
 				msg1Payload[i] = 'A'

server/opts_test.go

@@ -1888,7 +1888,7 @@ func TestParseExport(t *testing.T) {
 	nc1 := connect("u1")
 	defer nc1.Close()
 	nc2 := connect("u2")
-	defer nc1.Close()
+	defer nc2.Close()
 	subscribe := func(nc *nats.Conn, msgs int, subj string) (*sync.WaitGroup, *nats.Subscription) {
 		wg := sync.WaitGroup{}
 		wg.Add(msgs)

test/tls_test.go

@@ -796,7 +796,6 @@ func TestTLSRoutesCertificateImplicitAllowFail(t *testing.T) {
 }
 
 func testTLSRoutesCertificateImplicitAllow(t *testing.T, pass bool) {
-	t.Helper()
 	// Base config for the servers
 	cfg := createFile(t, "cfg")
 	defer removeFile(t, cfg.Name())