test: remove .root-* files created during immugw tests

Author: padurean

cmd/immuadmin/command/backup_test.go

@@ -53,7 +53,7 @@ func TestDumpToFile(t *testing.T) {
 		os.RemoveAll(clientDir)
 	}()
 	clOp := immuclient.DefaultOptions().WithPort(tcpPort).WithDir(clientDir)
-	ic, err := immuclient.NewImmuClient(&clOp)
+	ic, err := immuclient.NewImmuClient(clOp)
 	if err != nil {
 		t.Errorf("%s", err.Error())
 	}

pkg/client/options.go

@@ -56,7 +56,7 @@ func DefaultOptions() *Options {
 }
 
 // WithDir sets program file folder
-func (o Options) WithDir(dir string) Options {
+func (o *Options) WithDir(dir string) *Options {
 	o.Dir = dir
 	return o
 }

pkg/gw/safereference_handler_test.go

@@ -33,10 +33,13 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 )
 
-func insertSampleSet(immudbTCPPort int) (string, error) {
+var safereferenceHandlerTestDir = "./safereference_handler_test"
+
+func insertSampleSet(immudbTCPPort int, clientDir string) (string, error) {
 	key := base64.StdEncoding.EncodeToString([]byte("Pablo"))
 	value := base64.StdEncoding.EncodeToString([]byte("Picasso"))
-	ic, err := immuclient.NewImmuClient(immuclient.DefaultOptions().WithPort(immudbTCPPort))
+	ic, err := immuclient.NewImmuClient(immuclient.DefaultOptions().
+		WithPort(immudbTCPPort).WithDir(clientDir))
 	if err != nil {
 		return "", fmt.Errorf("unable to instantiate client: %s", err)
 	}
@@ -81,14 +84,16 @@ func TestSafeReference(t *testing.T) {
 		s.Stop()
 		time.Sleep(2 * time.Second) //without the delay the db dir is deleted before all the data has been flushed to disk and results in crash.
 		os.RemoveAll(op.Dir)
+		os.RemoveAll(safereferenceHandlerTestDir)
 	}()
 
-	refKey, err := insertSampleSet(tcpPort)
+	refKey, err := insertSampleSet(tcpPort, safereferenceHandlerTestDir)
 	if err != nil {
 		t.Errorf("%s", err)
 	}
 
-	ic, err := immuclient.NewImmuClient(immuclient.DefaultOptions().WithPort(tcpPort))
+	ic, err := immuclient.NewImmuClient(immuclient.DefaultOptions().
+		WithPort(tcpPort).WithDir(safereferenceHandlerTestDir))
 	if err != nil {
 		t.Errorf("unable to instantiate client: %s", err)
 		return

pkg/gw/safeset_handler_test.go

@@ -32,6 +32,8 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 )
 
+var safesetHandlerTestDir = "./safeset_handler_test"
+
 func generateRandomTCPPort() int {
 	rand.Seed(time.Now().UnixNano())
 	min := 1024
@@ -54,9 +56,11 @@ func TestSafeset(t *testing.T) {
 		s.Stop()
 		time.Sleep(2 * time.Second) //without the delay the db dir is deleted before all the data has been flushed to disk and results in crash.
 		os.RemoveAll(op.Dir)
+		os.RemoveAll(safesetHandlerTestDir)
 	}()
 
-	ic, err := immuclient.NewImmuClient(immuclient.DefaultOptions().WithPort(tcpPort))
+	ic, err := immuclient.NewImmuClient(immuclient.DefaultOptions().
+		WithPort(tcpPort).WithDir(safesetHandlerTestDir))
 	if err != nil {
 		t.Errorf("unable to instantiate client: %s", err)
 		return

pkg/gw/safezadd_handler_test.go

@@ -31,6 +31,8 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 )
 
+var safezaddHandlerTestDir = "./safezadd_handler_test"
+
 func TestSafeZAdd(t *testing.T) {
 	setName := base64.StdEncoding.EncodeToString([]byte("Soprano"))
 	uknownKey := base64.StdEncoding.EncodeToString([]byte("Marias Callas"))
@@ -46,13 +48,15 @@ func TestSafeZAdd(t *testing.T) {
 		s.Stop()
 		time.Sleep(2 * time.Second) //without the delay the db dir is deleted before all the data has been flushed to disk and results in crash.
 		os.RemoveAll(op.Dir)
+		os.RemoveAll(safezaddHandlerTestDir)
 	}()
 
-	refkey, err := insertSampleSet(tcpPort)
+	refkey, err := insertSampleSet(tcpPort, safezaddHandlerTestDir)
 	if err != nil {
 		t.Errorf("%s", err)
 	}
-	ic, err := immuclient.NewImmuClient(immuclient.DefaultOptions().WithPort(tcpPort))
+	ic, err := immuclient.NewImmuClient(immuclient.DefaultOptions().
+		WithPort(tcpPort).WithDir(safezaddHandlerTestDir))
 
 	if err != nil {
 		t.Errorf("unable to instantiate client: %s", err)