From c547caf04f17dee0390733fc9167e68975aecdb9 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 12 Dec 2017 19:08:22 -0500
Subject: [PATCH] db: some test cleanup

---
 db/backend_test.go    | 14 +++++++++-----
 db/c_level_db_test.go | 11 +++++++++++
 db/db.go              |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/db/backend_test.go b/db/backend_test.go
index b21ce0037..3d10c66cb 100644
--- a/db/backend_test.go
+++ b/db/backend_test.go
@@ -58,7 +58,6 @@ func TestBackendsNilKeys(t *testing.T) {
 		name := cmn.Fmt("test_%x", cmn.RandStr(12))
 		db, err := creator(name, "")
 		assert.Nil(t, err)
-		defer os.RemoveAll(name)
 
 		assertPanics(t, dbType, "get", func() { db.Get(nil) })
 		assertPanics(t, dbType, "has", func() { db.Has(nil) })
@@ -68,13 +67,18 @@ 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 TestLevelDBBackendStr(t *testing.T) {
+func TestGoLevelDBBackendStr(t *testing.T) {
 	name := cmn.Fmt("test_%x", cmn.RandStr(12))
 	db := NewDB(name, LevelDBBackendStr, "")
-	defer os.RemoveAll(name)
-	_, ok := db.(*GoLevelDB)
-	assert.True(t, ok)
+	defer os.RemoveAll(name + ".db")
+
+	if _, ok := backends[CLevelDBBackendStr]; !ok {
+		_, ok := db.(*GoLevelDB)
+		assert.True(t, ok)
+	}
 }
diff --git a/db/c_level_db_test.go b/db/c_level_db_test.go
index 864362332..606c34519 100644
--- a/db/c_level_db_test.go
+++ b/db/c_level_db_test.go
@@ -5,8 +5,10 @@ package db
 import (
 	"bytes"
 	"fmt"
+	"os"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	cmn "github.com/tendermint/tmlibs/common"
 )
 
@@ -84,3 +86,12 @@ func bytes2Int64(buf []byte) int64 {
 	return int64(binary.BigEndian.Uint64(buf))
 }
 */
+
+func TestCLevelDBBackendStr(t *testing.T) {
+	name := cmn.Fmt("test_%x", cmn.RandStr(12))
+	db := NewDB(name, LevelDBBackendStr, "")
+	defer os.RemoveAll(name)
+
+	_, ok := db.(*CLevelDB)
+	assert.True(t, ok)
+}
diff --git a/db/db.go b/db/db.go
index 7eec04d56..b43b06554 100644
--- a/db/db.go
+++ b/db/db.go
@@ -6,7 +6,7 @@ import "fmt"
 // Main entry
 
 const (
-	LevelDBBackendStr   = "leveldb" // legacy, defaults to goleveldb.
+	LevelDBBackendStr   = "leveldb" // legacy, defaults to goleveldb unless +gcc
 	CLevelDBBackendStr  = "cleveldb"
 	GoLevelDBBackendStr = "goleveldb"
 	MemDBBackendStr     = "memdb"