test: Simplify testSetupFunc and remove dependency

gohugoio · Oct 3, 2023 · 176d2a7 · 176d2a7
1 parent 4c95389
commit 176d2a7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/bep/godartsass/v2 v2.0.0
 	github.com/bep/golibsass v1.1.1
 	github.com/bep/gowebp v0.2.0
-	github.com/bep/helpers v0.4.0
 	github.com/bep/lazycache v0.2.0
 	github.com/bep/logg v0.2.0
 	github.com/bep/mclib v1.20400.20402

diff --git a/go.sum b/go.sum
@@ -133,8 +133,6 @@ github.com/bep/golibsass v1.1.1 h1:xkaet75ygImMYjM+FnHIT3xJn7H0xBA9UxSOJjk8Khw=
 github.com/bep/golibsass v1.1.1/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA=
 github.com/bep/gowebp v0.2.0 h1:ZVfK8i9PpZqKHEmthQSt3qCnnHycbLzBPEsVtk2ch2Q=
 github.com/bep/gowebp v0.2.0/go.mod h1:ZhFodwdiFp8ehGJpF4LdPl6unxZm9lLFjxD3z2h2AgI=
-github.com/bep/helpers v0.4.0 h1:ab9veaAiWY4ST48Oxp5usaqivDmYdB744fz+tcZ3Ifs=
-github.com/bep/helpers v0.4.0/go.mod h1:/QpHdmcPagDw7+RjkLFCvnlUc8lQ5kg4KDrEkb2Yyco=
 github.com/bep/lazycache v0.2.0 h1:HKrlZTrDxHIrNKqmnurH42ryxkngCMYLfBpyu40VcwY=
 github.com/bep/lazycache v0.2.0/go.mod h1:xUIsoRD824Vx0Q/n57+ZO7kmbEhMBOnTjM/iPixNGbg=
 github.com/bep/logg v0.2.0 h1:EWKB04ea/K/V0xd/7O6x5q+1l+Grub+9N48YMcevtF4=

diff --git a/main_test.go b/main_test.go
@@ -30,7 +30,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bep/helpers/envhelpers"
 	"github.com/gohugoio/hugo/commands"
 	"github.com/rogpeppe/go-internal/testscript"
 )
@@ -373,38 +372,39 @@ var commonTestScriptsParam = testscript.Params{
 func testSetupFunc() func(env *testscript.Env) error {
 	sourceDir, _ := os.Getwd()
 	return func(env *testscript.Env) error {
-		var keyVals []string
-		keyVals = append(keyVals, "HUGO_TESTRUN", "true")
-		keyVals = append(keyVals, "HUGO_CACHEDIR", filepath.Join(env.WorkDir, "hugocache"))
 		xdghome := filepath.Join(env.WorkDir, "xdgcachehome")
-		keyVals = append(keyVals, "XDG_CACHE_HOME", xdghome)
-		home := filepath.Join(env.WorkDir, "home")
-		keyVals = append(keyVals, "HOME", home)
-
-		if runtime.GOOS == "darwin" {
-			if err := os.MkdirAll(filepath.Join(home, "Library", "Caches"), 0777); err != nil {
+		if runtime.GOOS == "linux" {
+			if err := os.MkdirAll(xdghome, 0777); err != nil {
 				return err
 			}
 		}
 
-		if runtime.GOOS == "linux" {
-			if err := os.MkdirAll(xdghome, 0777); err != nil {
+		home := filepath.Join(env.WorkDir, "home")
+		if runtime.GOOS == "darwin" {
+			if err := os.MkdirAll(filepath.Join(home, "Library", "Caches"), 0777); err != nil {
 				return err
 			}
 		}
 
-		keyVals = append(keyVals, "SOURCE", sourceDir)
-
 		goVersion := runtime.Version()
-
 		goVersion = strings.TrimPrefix(goVersion, "go")
 		if strings.HasPrefix(goVersion, "1.20") {
 			// Strip patch version.
 			goVersion = goVersion[:strings.LastIndex(goVersion, ".")]
 		}
 
-		keyVals = append(keyVals, "GOVERSION", goVersion)
-		envhelpers.SetEnvVars(&env.Vars, keyVals...)
+		keyVals := map[string]string{
+			"HUGO_TESTRUN":   "true",
+			"HUGO_CACHEDIR":  filepath.Join(env.WorkDir, "hugocache"),
+			"XDG_CACHE_HOME": xdghome,
+			"HOME":           home,
+			"SOURCE":         sourceDir,
+			"GOVERSION":      goVersion,
+		}
+
+		for key, value := range keyVals {
+			env.Setenv(key, value)
+		}
 
 		return nil
 	}