commitlog: better temp dir use

vincentbernat · Aug 6, 2018 · 87f6136 · 87f6136
1 parent d893db1
commit 87f6136
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/commitlog/commitlog_test.go b/commitlog/commitlog_test.go
@@ -2,10 +2,8 @@ package commitlog_test
 
 import (
 	"bytes"
-	"fmt"
-	"math/rand"
+	"io/ioutil"
 	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -147,8 +145,10 @@ func setup(t require.TestingT) *commitlog.CommitLog {
 }
 
 func setupWithOptions(t require.TestingT, opts commitlog.Options) *commitlog.CommitLog {
+	var err error
 	if opts.Path == "" {
-		opts.Path = filepath.Join(os.TempDir(), fmt.Sprintf("commitlogtest%d", rand.Int63()))
+		opts.Path, err = ioutil.TempDir("", "commitlogtest")
+		require.NoError(t, err)
 	}
 	l, err := commitlog.New(opts)
 	require.NoError(t, err)

diff --git a/commitlog/compact_cleaner_test.go b/commitlog/compact_cleaner_test.go
@@ -1,6 +1,7 @@
 package commitlog_test
 
 import (
+	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -43,7 +44,8 @@ func TestCompactCleaner(t *testing.T) {
 		Timestamp: time.Now(),
 	}))
 
-	path := os.TempDir()
+	path, err := ioutil.TempDir("", "commitlog-delete-cleaner")
+	req.NoError(err)
 	defer os.RemoveAll(path)
 
 	l := setupWithOptions(t, commitlog.Options{

diff --git a/commitlog/delete_cleaner_test.go b/commitlog/delete_cleaner_test.go
@@ -1,7 +1,7 @@
 package commitlog_test
 
 import (
-	"fmt"
+	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -44,8 +44,8 @@ func TestDeleteCleaner(t *testing.T) {
 		Timestamp: time.Now(),
 	}))
 
-	path := os.TempDir()
-	fmt.Println(path)
+	path, err := ioutil.TempDir("", "commitlog-delete-cleaner")
+	req.NoError(err)
 	defer os.RemoveAll(path)
 
 	l := setupWithOptions(t, commitlog.Options{

diff --git a/commitlog/index_test.go b/commitlog/index_test.go
@@ -1,17 +1,18 @@
 package commitlog
 
 import (
-	"fmt"
+	"io/ioutil"
 	"math/rand"
 	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
 func TestIndex(t *testing.T) {
-	path := filepath.Join(os.TempDir(), fmt.Sprintf(fileFormat, rand.Int63(), indexSuffix))
+	path, err := ioutil.TempDir("", "commitlog-index")
+	require.NoError(t, err)
+
 	totalEntries := rand.Intn(10) + 10
 	//case for roundDown
 	bytes := int64(totalEntries*entryWidth + 1)
@@ -72,7 +73,9 @@ func TestIndex(t *testing.T) {
 }
 
 func TestIndexScanner(t *testing.T) {
-	path := filepath.Join(os.TempDir(), fmt.Sprintf(fileFormat, rand.Int63(), indexSuffix))
+	path, err := ioutil.TempDir("", "commitlog-index")
+	require.NoError(t, err)
+
 	totalEntries := rand.Intn(10) + 10
 	//case for roundDown
 	bytes := int64(totalEntries*entryWidth + 1)