Refactor to k6 lookupEnv and abstract env. var. lookup

chromium/browser_type.go

@@ -179,8 +179,9 @@ func (b *BrowserType) launch(
 	if err != nil {
 		return nil, 0, fmt.Errorf("%w", err)
 	}
+
 	dataDir := &storage.Dir{}
-	if err := dataDir.Make("", flags["user-data-dir"]); err != nil {
+	if err := dataDir.Make(b.tmpdir(), flags["user-data-dir"]); err != nil {
 		return nil, 0, fmt.Errorf("%w", err)
 	}
 	flags["user-data-dir"] = dataDir.Dir
@@ -217,6 +218,14 @@ func (b *BrowserType) launch(
 	return browser, browserProc.Pid(), nil
 }
 
+// tmpdir returns the temporary directory to use for the browser.
+// It returns the value of the TMPDIR environment variable if set,
+// otherwise it returns an empty string.
+func (b *BrowserType) tmpdir() string {
+	dir, _ := b.envLookupper("TMPDIR")
+	return dir
+}
+
 // LaunchPersistentContext launches the browser with persistent storage.
 func (b *BrowserType) LaunchPersistentContext(userDataDir string, opts goja.Value) api.Browser {
 	rt := b.vu.Runtime()

tests/browser_test.go

@@ -40,18 +40,19 @@ func TestBrowserNewPage(t *testing.T) {
 }
 
 func TestTmpDirCleanup(t *testing.T) {
+	t.Parallel()
+
 	tmpDirPath := "./"
 
-	err := os.Setenv("TMPDIR", tmpDirPath)
-	assert.NoError(t, err)
-	defer func() {
-		err = os.Unsetenv("TMPDIR")
-		assert.NoError(t, err)
-	}()
+	b := newTestBrowser(t, withSkipClose(), withLookupFunc(func(k string) (string, bool) {
+		if k == "TMPDIR" {
+			return tmpDirPath, true
+		}
+		return "", false
+	}))
 
-	b := newTestBrowser(t, withSkipClose())
 	p := b.NewPage(nil)
-	err = p.Close(nil)
+	err := p.Close(nil)
 	require.NoError(t, err)
 
 	matches, err := filepath.Glob(tmpDirPath + "xk6-browser-data-*")