Merge "Use different folders for ledger tests in packages"

hyperledger · Jan 26, 2017 · 135d923 · 135d923
2 parents 6ad68d5 + 88e0e87
commit 135d923
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 25 deletions.
diff --git a/core/ledger/blkstorage/fsblkstorage/block_stream_test.go b/core/ledger/blkstorage/fsblkstorage/block_stream_test.go
@@ -30,7 +30,7 @@ func TestBlockfileStream(t *testing.T) {
 }
 
 func testBlockfileStream(t *testing.T, numBlocks int) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	ledgerid := "testledger"
 	w := newTestBlockfileWrapper(env, ledgerid)
@@ -71,7 +71,7 @@ func TestBlockFileStreamUnexpectedEOF(t *testing.T) {
 }
 
 func testBlockFileStreamUnexpectedEOF(t *testing.T, numBlocks int, partialBlockBytes []byte) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	w := newTestBlockfileWrapper(env, "testLedger")
 	blockfileMgr := w.blockfileMgr
@@ -100,7 +100,7 @@ func TestBlockStream(t *testing.T) {
 }
 
 func testBlockStream(t *testing.T, numFiles int) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	w := newTestBlockfileWrapper(env, "testLedger")
 	defer w.close()

diff --git a/core/ledger/blkstorage/fsblkstorage/blockfile_mgr_test.go b/core/ledger/blkstorage/fsblkstorage/blockfile_mgr_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 func TestBlockfileMgrBlockReadWrite(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, "testLedger")
 	defer blkfileMgrWrapper.close()
@@ -47,7 +47,7 @@ func TestBlockfileMgrCrashDuringWriting(t *testing.T) {
 
 func testBlockfileMgrCrashDuringWriting(t *testing.T, numBlocksBeforeCheckpoint int,
 	numBlocksAfterCheckpoint int, numLastBlockBytes int, numPartialBytesToWrite int) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	ledgerid := "testLedger"
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, ledgerid)
@@ -92,7 +92,7 @@ func testBlockfileMgrCrashDuringWriting(t *testing.T, numBlocksBeforeCheckpoint
 }
 
 func TestBlockfileMgrBlockIterator(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, "testLedger")
 	defer blkfileMgrWrapper.close()
@@ -120,7 +120,7 @@ func testBlockfileMgrBlockIterator(t *testing.T, blockfileMgr *blockfileMgr,
 }
 
 func TestBlockfileMgrBlockchainInfo(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, "testLedger")
 	defer blkfileMgrWrapper.close()
@@ -135,7 +135,7 @@ func TestBlockfileMgrBlockchainInfo(t *testing.T) {
 }
 
 func TestBlockfileMgrGetTxById(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, "testLedger")
 	defer blkfileMgrWrapper.close()
@@ -156,7 +156,7 @@ func TestBlockfileMgrGetTxById(t *testing.T) {
 }
 
 func TestBlockfileMgrRestart(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	ledgerid := "testLedger"
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, ledgerid)
@@ -182,7 +182,7 @@ func TestBlockfileMgrFileRolling(t *testing.T) {
 	}
 
 	maxFileSie := int(0.75 * float64(size))
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", maxFileSie))
+	env := newTestEnv(t, NewConf(testPath, maxFileSie))
 	defer env.Cleanup()
 	ledgerid := "testLedger"
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, ledgerid)

diff --git a/core/ledger/blkstorage/fsblkstorage/blockfile_scan_test.go b/core/ledger/blkstorage/fsblkstorage/blockfile_scan_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 func TestBlockFileScanSmallTxOnly(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	ledgerid := "testLedger"
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, ledgerid)
@@ -50,7 +50,7 @@ func TestBlockFileScanSmallTxOnly(t *testing.T) {
 }
 
 func TestBlockFileScanSmallTxLastTxIncomplete(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	ledgerid := "testLedger"
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, ledgerid)

diff --git a/core/ledger/blkstorage/fsblkstorage/blockindex_test.go b/core/ledger/blkstorage/fsblkstorage/blockindex_test.go
@@ -54,7 +54,7 @@ func TestBlockIndexSync(t *testing.T) {
 }
 
 func testBlockIndexSync(t *testing.T, numBlocks int, numBlocksToIndex int, syncByRestart bool) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	ledgerid := "testledger"
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, ledgerid)
@@ -113,7 +113,7 @@ func TestBlockIndexSelectiveIndexing(t *testing.T) {
 }
 
 func testBlockIndexSelectiveIndexing(t *testing.T, indexItems []blkstorage.IndexableAttr) {
-	env := newTestEnvSelectiveIndexing(t, NewConf("/tmp/fabric/ledgertests", 0), indexItems)
+	env := newTestEnvSelectiveIndexing(t, NewConf(testPath, 0), indexItems)
 	defer env.Cleanup()
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, "testledger")
 	defer blkfileMgrWrapper.close()

diff --git a/core/ledger/blkstorage/fsblkstorage/blocks_itr_test.go b/core/ledger/blkstorage/fsblkstorage/blocks_itr_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 func TestBlocksItrBlockingNext(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 	blkfileMgrWrapper := newTestBlockfileWrapper(env, "testLedger")
 	defer blkfileMgrWrapper.close()

diff --git a/core/ledger/blkstorage/fsblkstorage/fs_blockstore_provider_test.go b/core/ledger/blkstorage/fsblkstorage/fs_blockstore_provider_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 func TestMultipleBlockStores(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 
 	provider := env.provider
@@ -65,7 +65,7 @@ func checkBlocks(t *testing.T, expectedBlocks []*common.Block, store blkstorage.
 }
 
 func TestBlockStoreProvider(t *testing.T) {
-	env := newTestEnv(t, NewConf("/tmp/fabric/ledgertests", 0))
+	env := newTestEnv(t, NewConf(testPath, 0))
 	defer env.Cleanup()
 
 	provider := env.provider

diff --git a/core/ledger/blkstorage/fsblkstorage/pkg_test.go b/core/ledger/blkstorage/fsblkstorage/pkg_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/hyperledger/fabric/protos/common"
 )
 
-var testPath = "/tmp/fabric/ledgertests"
+var testPath = "/tmp/fabric/ledgertests/blkstorage/fsblkstorage"
 
 type testEnv struct {
 	t        testing.TB

diff --git a/core/ledger/kvledger/pkg_test.go b/core/ledger/kvledger/pkg_test.go
@@ -29,7 +29,7 @@ type testEnv struct {
 }
 
 func newTestEnv(t testing.TB) *testEnv {
-	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests")
+	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests/kvledger")
 	env := &testEnv{t}
 	env.cleanup()
 	return env

diff --git a/core/ledger/kvledger/txmgmt/statedb/stateleveldb/stateleveldb_test.go b/core/ledger/kvledger/txmgmt/statedb/stateleveldb/stateleveldb_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests")
+	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests/kvledger/txmgmt/statedb/stateleveldb")
 	os.Exit(m.Run())
 }
 

diff --git a/core/ledger/kvledger/txmgmt/txmgr/commontests/pkg_test.go b/core/ledger/kvledger/txmgmt/txmgr/commontests/pkg_test.go
@@ -31,6 +31,10 @@ import (
 	"github.com/spf13/viper"
 )
 
+const (
+	testFilesystemPath = "/tmp/fabric/ledgertests/kvledger/txmgmt/txmgr/commontests"
+)
+
 type testEnv interface {
 	init(t *testing.T)
 	getName() string
@@ -68,7 +72,7 @@ func (env *levelDBLockBasedEnv) getName() string {
 }
 
 func (env *levelDBLockBasedEnv) init(t *testing.T) {
-	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests")
+	viper.Set("peer.fileSystemPath", testFilesystemPath)
 	testDBEnv := stateleveldb.NewTestVDBEnv(t)
 	testDB, err := testDBEnv.DBProvider.GetDBHandle("TestDB")
 	testutil.AssertNoError(t, err, "")
@@ -107,7 +111,7 @@ func (env *couchDBLockBasedEnv) getName() string {
 }
 
 func (env *couchDBLockBasedEnv) init(t *testing.T) {
-	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests")
+	viper.Set("peer.fileSystemPath", testFilesystemPath)
 	viper.Set("ledger.state.couchDBConfig.couchDBAddress", "127.0.0.1:5984")
 	testDBEnv := statecouchdb.NewTestVDBEnv(t)
 	testDB, err := testDBEnv.DBProvider.GetDBHandle(couchTestChainID)

diff --git a/core/ledger/kvledger/txmgmt/validator/statebasedval/state_based_validator_test.go b/core/ledger/kvledger/txmgmt/validator/statebasedval/state_based_validator_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests")
+	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests/kvledger/txmgmt/validator/statebasedval")
 	os.Exit(m.Run())
 }
 

diff --git a/core/ledger/ledgermgmt/ledger_mgmt_test.go b/core/ledger/ledgermgmt/ledger_mgmt_test.go
@@ -20,10 +20,18 @@ import (
 	"fmt"
 	"testing"
 
+	"os"
+
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/ledger/testutil"
+	"github.com/spf13/viper"
 )
 
+func TestMain(m *testing.M) {
+	viper.Set("peer.fileSystemPath", "/tmp/fabric/ledgertests/ledgermgmt")
+	os.Exit(m.Run())
+}
+
 func TestLedgerMgmt(t *testing.T) {
 	InitializeTestEnv()
 	defer CleanupTestEnv()

diff --git a/core/ledger/ledgermgmt/ledger_mgmt_test_exports.go b/core/ledger/ledgermgmt/ledger_mgmt_test_exports.go
@@ -19,6 +19,8 @@ package ledgermgmt
 import (
 	"os"
 
+	"fmt"
+
 	"github.com/hyperledger/fabric/core/ledger/ledgerconfig"
 )
 
@@ -36,6 +38,7 @@ func CleanupTestEnv() {
 
 func remove() {
 	path := ledgerconfig.GetRootPath()
+	fmt.Printf("removing dir = %s\n", path)
 	err := os.RemoveAll(path)
 	if err != nil {
 		logger.Errorf("Error: %s", err)

diff --git a/core/ledger/ordererledger/fs_ordererledger_test.go b/core/ledger/ordererledger/fs_ordererledger_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	testFolder = "/tmp/test/ledger/ordererledger"
+	testFolder = "/tmp/fabric/ledgertests/ordererledger"
 )
 
 func TestOrdererLedger(t *testing.T) {

diff --git a/core/ledger/util/leveldbhelper/leveldb_helper_test.go b/core/ledger/util/leveldbhelper/leveldb_helper_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/hyperledger/fabric/core/ledger/testutil"
 )
 
-const testDBPath = "/tmp/test/hyperledger/fabric/core/ledger/util/db"
+const testDBPath = "/tmp/fabric/ledgertests/util/leveldbhelper"
 
 func TestDBBasicWriteAndReads(t *testing.T) {
 	testDBBasicWriteAndReads(t, "db1", "db2", "")