From bb115d4d615bdbe04e664b76346900151f83729e Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 12 Dec 2017 19:28:52 -0500
Subject: [PATCH] cleanupDBDir

---
 db/backend_test.go    | 11 ++++++++---
 db/c_level_db_test.go |  3 +--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/db/backend_test.go b/db/backend_test.go
index 9dc17201a..16649cd20 100644
--- a/db/backend_test.go
+++ b/db/backend_test.go
@@ -3,6 +3,7 @@ package db
 import (
 	"fmt"
 	"os"
+	"path"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -10,11 +11,16 @@ import (
 	cmn "github.com/tendermint/tmlibs/common"
 )
 
+func cleanupDBDir(dir, name string) {
+	os.RemoveAll(path.Join(dir, name) + ".db")
+}
+
 func testBackendGetSetDelete(t *testing.T, backend string) {
 	// Default
 	dir, dirname := cmn.Tempdir(fmt.Sprintf("test_backend_%s_", backend))
 	defer dir.Close()
 	db := NewDB("testdb", backend, dirname)
+
 	key := []byte("abc")
 	require.Nil(t, db.Get(key))
 
@@ -53,6 +59,7 @@ func TestBackendsNilKeys(t *testing.T) {
 	for dbType, creator := range backends {
 		name := cmn.Fmt("test_%x", cmn.RandStr(12))
 		db, err := creator(name, "")
+		defer cleanupDBDir("", name)
 		assert.Nil(t, err)
 
 		assertPanics(t, dbType, "get", func() { db.Get(nil) })
@@ -63,15 +70,13 @@ func TestBackendsNilKeys(t *testing.T) {
 		assertPanics(t, dbType, "deletesync", func() { db.DeleteSync(nil) })
 
 		db.Close()
-		err = os.RemoveAll(name + ".db")
-		assert.Nil(t, err)
 	}
 }
 
 func TestGoLevelDBBackendStr(t *testing.T) {
 	name := cmn.Fmt("test_%x", cmn.RandStr(12))
 	db := NewDB(name, LevelDBBackendStr, "")
-	defer os.RemoveAll(name + ".db")
+	defer cleanupDBDir("", name)
 
 	if _, ok := backends[CLevelDBBackendStr]; !ok {
 		_, ok := db.(*GoLevelDB)
diff --git a/db/c_level_db_test.go b/db/c_level_db_test.go
index 606c34519..89993fbac 100644
--- a/db/c_level_db_test.go
+++ b/db/c_level_db_test.go
@@ -5,7 +5,6 @@ package db
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -90,7 +89,7 @@ func bytes2Int64(buf []byte) int64 {
 func TestCLevelDBBackendStr(t *testing.T) {
 	name := cmn.Fmt("test_%x", cmn.RandStr(12))
 	db := NewDB(name, LevelDBBackendStr, "")
-	defer os.RemoveAll(name)
+	defer cleanupDBDir("", name)
 
 	_, ok := db.(*CLevelDB)
 	assert.True(t, ok)