/*
Copyright IBM Corp. 2016 All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

		 http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package kvledger

import (
	"math/rand"
	"os"
	"path/filepath"
	"strconv"
	"testing"

	"github.com/spf13/viper"
)

type testEnv struct {
	t    testing.TB
	path string
}

func newTestEnv(t testing.TB) *testEnv {
	path := filepath.Join(
		os.TempDir(),
		"fabric",
		"ledgertests",
		"kvledger",
		strconv.Itoa(rand.Int()))
	return createTestEnv(t, path)
}

func createTestEnv(t testing.TB, path string) *testEnv {
	env := &testEnv{
		t:    t,
		path: path}
	env.cleanup()
	viper.Set("peer.fileSystemPath", env.path)
	return env
}

func (env *testEnv) cleanup() {
	os.RemoveAll(env.path)
}

/*
Copyright IBM Corp. 2016 All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

		 http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package kvledger

import (
	"os"
	"testing"

	"github.com/hyperledger/fabric/core/config"
	"github.com/spf13/viper"
)

type testEnv struct {
	t testing.TB
}

func newTestEnv(t testing.TB) *testEnv {
	return createTestEnv(t, "/tmp/fabric/ledgertests/kvledger")
}

func createTestEnv(t testing.TB, path string) *testEnv {
	viper.Set("peer.fileSystemPath", path)
	env := &testEnv{t}
	env.cleanup()
	return env
}

func (env *testEnv) cleanup() {
	path := config.GetPath("peer.fileSystemPath")
	os.RemoveAll(path)
}

--- 
+++ 
@@ -17,29 +17,39 @@
 package kvledger
 
 import (
+	"math/rand"
 	"os"
+	"path/filepath"
+	"strconv"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/config"
 	"github.com/spf13/viper"
 )
 
 type testEnv struct {
-	t testing.TB
+	t    testing.TB
+	path string
 }
 
 func newTestEnv(t testing.TB) *testEnv {
-	return createTestEnv(t, "/tmp/fabric/ledgertests/kvledger")
+	path := filepath.Join(
+		os.TempDir(),
+		"fabric",
+		"ledgertests",
+		"kvledger",
+		strconv.Itoa(rand.Int()))
+	return createTestEnv(t, path)
 }
 
 func createTestEnv(t testing.TB, path string) *testEnv {
-	viper.Set("peer.fileSystemPath", path)
-	env := &testEnv{t}
+	env := &testEnv{
+		t:    t,
+		path: path}
 	env.cleanup()
+	viper.Set("peer.fileSystemPath", env.path)
 	return env
 }
 
 func (env *testEnv) cleanup() {
-	path := config.GetPath("peer.fileSystemPath")
-	os.RemoveAll(path)
+	os.RemoveAll(env.path)
 }
[FAB-9222] Fix ledger test race condition

There seems to be contention for a base ledger
directory used throughout the tests.  This change
adds a random directory to the paths for tests in
the base package.

Change-Id: I25a9f4312cf0f4b55596d69e46ab0b4b07f0912c
Signed-off-by: Gari Singh <10008a422f4be611b73174084ba2f7f909d5b402@gmail.com>
