fix cleanup

atlasaction/gitlab_ci_test.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"sync"
 	"testing"
 )
 
@@ -87,22 +88,26 @@ func newMockHandler(dir string) http.Handler {
 }
 
 func TestGitlabCI(t *testing.T) {
-	var srv *httptest.Server
-	cleanup := func() {
-		if srv != nil {
-			srv.Close()
+	var (
+		servers = make([]*httptest.Server, 0)
+		lock    = &sync.Mutex{}
+	)
+	defer func() {
+		for _, server := range servers {
+			server.Close()
 		}
-	}
-	defer cleanup()
+	}()
 	testscript.Run(t, testscript.Params{
 		Dir: "testdata/gitlab",
 		Setup: func(env *testscript.Env) error {
 			commentsDir := filepath.Join(env.WorkDir, "comments")
+			srv := httptest.NewServer(newMockHandler(commentsDir))
 			if err := os.Mkdir(commentsDir, os.ModePerm); err != nil {
 				return err
 			}
-			cleanup()
-			srv = httptest.NewServer(newMockHandler(commentsDir))
+			lock.Lock()
+			servers = append(servers, srv)
+			lock.Unlock()
 			env.Setenv("GITLAB_CI", "true")
 			env.Setenv("CI_PROJECT_ID", "1")
 			env.Setenv("CI_API_V4_URL", srv.URL)