From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 13 Sep 2023 01:36:44 +0000 (-0700)
Subject: cmd/go/internal/fsys: improve initOverlay test helper
X-Git-Tag: go1.22rc1~772
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=77a1104975ebf5646f38978a054afe7ca4501fd8;p=gostls13.git

cmd/go/internal/fsys: improve initOverlay test helper

1. Remove the use of fmt.Sprintf from t.Fatal.

2. Check for errors from initFromJSON.

3. Move 'overlay=0' to a separate cleanup function, for clarity.

Change-Id: I4d0daad248e8f26b6f159b4cc7e77fd60dc1ed98
Reviewed-on: https://go-review.googlesource.com/c/go/+/527700
Auto-Submit: Bryan Mills <bcmills@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Kirill Kolyshkin <kolyshkin@gmail.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
---

diff --git a/src/cmd/go/internal/fsys/fsys_test.go b/src/cmd/go/internal/fsys/fsys_test.go
index 2ab2bb2fba..612c5213c1 100644
--- a/src/cmd/go/internal/fsys/fsys_test.go
+++ b/src/cmd/go/internal/fsys/fsys_test.go
@@ -7,7 +7,6 @@ package fsys
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"internal/testenv"
 	"internal/txtar"
 	"io"
@@ -38,7 +37,6 @@ func initOverlay(t *testing.T, config string) {
 		t.Fatal(err)
 	}
 	t.Cleanup(func() {
-		overlay = nil
 		if err := os.Chdir(prevwd); err != nil {
 			t.Fatal(err)
 		}
@@ -57,10 +55,13 @@ func initOverlay(t *testing.T, config string) {
 
 	var overlayJSON OverlayJSON
 	if err := json.Unmarshal(a.Comment, &overlayJSON); err != nil {
-		t.Fatal(fmt.Errorf("parsing overlay JSON: %v", err))
+		t.Fatal("parsing overlay JSON:", err)
 	}
 
-	initFromJSON(overlayJSON)
+	if err := initFromJSON(overlayJSON); err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { overlay = nil })
 }
 
 func TestIsDir(t *testing.T) {