Merge pull request #1574 from zhijianli88/cleanup-tempfiles

Cleanup tempfiles
notaryproject · Dec 30, 2020 · 6ff3461 · 6ff3461
2 parents f30214a + 525677b
commit 6ff3461
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/client/client_test.go b/client/client_test.go
@@ -654,6 +654,7 @@ func testInitRepoSigningKeys(t *testing.T, rootType string, serverManagesSnapsho
 	// Temporary directory where test files will be created
 	tempBaseDir, err := ioutil.TempDir("", "notary-test-")
 	require.NoError(t, err, "failed to create a temporary directory: %s", err)
+	defer os.RemoveAll(tempBaseDir)
 
 	repo, _, rootPubKeyID := createRepoAndKey(
 		t, data.ECDSAKey, tempBaseDir, "docker.com/notary", ts.URL)
@@ -3606,6 +3607,7 @@ func TestRemoveDelegationErrorWritingChanges(t *testing.T) {
 func TestClientInvalidURL(t *testing.T) {
 	tempBaseDir, err := ioutil.TempDir("", "notary-test-")
 	require.NoError(t, err, "failed to create a temporary directory: %s", err)
+	defer os.RemoveAll(tempBaseDir)
 	r, err := NewFileCachedRepository(
 		tempBaseDir,
 		"testGun",

diff --git a/cmd/notary/integration_test.go b/cmd/notary/integration_test.go
@@ -2931,7 +2931,7 @@ func TestExportImportFlow(t *testing.T) {
 
 	// now setup new filestore
 	newTempDir := tempDirWithConfig(t, "{}")
-	defer os.Remove(newTempDir)
+	defer os.RemoveAll(newTempDir)
 
 	// and new server
 	newServer := setupServer()
@@ -2997,10 +2997,10 @@ func TestDelegationKeyImportExport(t *testing.T) {
 	defer os.RemoveAll(tempDir)
 
 	tempExportedDir := tempDirWithConfig(t, "{}")
-	defer os.RemoveAll(tempDir)
+	defer os.RemoveAll(tempExportedDir)
 
 	tempImportingDir := tempDirWithConfig(t, "{}")
-	defer os.RemoveAll(tempDir)
+	defer os.RemoveAll(tempImportingDir)
 
 	// Setup key in a file for import
 	keyFile, err := ioutil.TempFile("", "pemfile")

diff --git a/server/storage/sqlite_test.go b/server/storage/sqlite_test.go
@@ -7,6 +7,7 @@ package storage
 import (
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"testing"
 
 	_ "github.com/mattn/go-sqlite3"
@@ -17,7 +18,7 @@ func sqlite3Setup(t *testing.T) (*SQLStorage, func()) {
 	tempBaseDir, err := ioutil.TempDir("", "notary-test-")
 	require.NoError(t, err)
 
-	dbStore := SetupSQLDB(t, "sqlite3", tempBaseDir+"test_db")
+	dbStore := SetupSQLDB(t, "sqlite3", filepath.Join(tempBaseDir, "test_db"))
 	var cleanup = func() {
 		dbStore.DB.Close()
 		os.RemoveAll(tempBaseDir)