Refactor mkdir in cleanup tests

1. Work with MkdirTemp to avoid dir name collisions.
2. Defer the cleanup before checking the error on MkdirTemp.
3. Work with RemoveAll to cleanup sub dirs and files incase the test
fails so that the cleanup still occurs as expected.

Resolves: #991 (comment)
Resolves: #991 (comment)

Author: ankur22

tests/browser_test.go

@@ -69,14 +69,12 @@ func TestBrowserNewContext(t *testing.T) {
 func TestTmpDirCleanup(t *testing.T) {
 	t.Parallel()
 
-	const tmpDirPath = "./1/"
-	err := os.Mkdir(tmpDirPath, os.ModePerm)
-	require.NoError(t, err)
-
+	tmpDirPath, err := os.MkdirTemp("./", "")
 	defer func() {
-		err = os.Remove(tmpDirPath)
+		err := os.RemoveAll(tmpDirPath)
 		require.NoError(t, err)
 	}()
+	require.NoError(t, err)
 
 	b := newTestBrowser(
 		t,
@@ -87,36 +85,34 @@ func TestTmpDirCleanup(t *testing.T) {
 	err = p.Close(nil)
 	require.NoError(t, err)
 
-	matches, err := filepath.Glob(tmpDirPath + "xk6-browser-data-*")
+	matches, err := filepath.Glob(tmpDirPath + "/xk6-browser-data-*")
 	assert.NoError(t, err)
 	assert.NotEmpty(t, matches, "a dir should exist that matches the pattern `xk6-browser-data-*`")
 
 	b.Close()
 
-	matches, err = filepath.Glob(tmpDirPath + "xk6-browser-data-*")
+	matches, err = filepath.Glob(tmpDirPath + "/xk6-browser-data-*")
 	assert.NoError(t, err)
 	assert.Empty(t, matches, "a dir shouldn't exist which matches the pattern `xk6-browser-data-*`")
 }
 
 func TestTmpDirCleanupOnContextClose(t *testing.T) {
 	t.Parallel()
 
-	const tmpDirPath = "./2/"
-	err := os.Mkdir(tmpDirPath, os.ModePerm)
-	require.NoError(t, err)
-
+	tmpDirPath, err := os.MkdirTemp("./", "")
 	defer func() {
-		err = os.Remove(tmpDirPath)
+		err := os.RemoveAll(tmpDirPath)
 		require.NoError(t, err)
 	}()
+	require.NoError(t, err)
 
 	b := newTestBrowser(
 		t,
 		withSkipClose(),
 		withEnvLookup(env.ConstLookup("TMPDIR", tmpDirPath)),
 	)
 
-	matches, err := filepath.Glob(tmpDirPath + "xk6-browser-data-*")
+	matches, err := filepath.Glob(tmpDirPath + "/xk6-browser-data-*")
 	assert.NoError(t, err)
 	assert.NotEmpty(t, matches, "a dir should exist that matches the pattern `xk6-browser-data-*`")
 
@@ -125,7 +121,7 @@ func TestTmpDirCleanupOnContextClose(t *testing.T) {
 
 	require.NotPanicsf(t, b.Close, "first call to browser.close should not panic")
 
-	matches, err = filepath.Glob(tmpDirPath + "xk6-browser-data-*")
+	matches, err = filepath.Glob(tmpDirPath + "/xk6-browser-data-*")
 	assert.NoError(t, err)
 	assert.Empty(t, matches, "a dir shouldn't exist which matches the pattern `xk6-browser-data-*`")
 }