From 7d999f1334650cdb8eeb34c6bf4e97f416cac5b9 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 7 Oct 2020 16:52:51 +0200 Subject: [PATCH] Fix metadata storage in tests --- .../pkg/indexer/index/cs3/non_unique_test.go | 4 ++-- accounts/pkg/indexer/index/cs3/unique_test.go | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/accounts/pkg/indexer/index/cs3/non_unique_test.go b/accounts/pkg/indexer/index/cs3/non_unique_test.go index c29001d27d..7d4c26fe87 100644 --- a/accounts/pkg/indexer/index/cs3/non_unique_test.go +++ b/accounts/pkg/indexer/index/cs3/non_unique_test.go @@ -11,8 +11,8 @@ import ( ) func TestCS3NonUniqueIndex_FakeSymlink(t *testing.T) { - go setupMetadataStorage() - defer cancelFunc() + //go setupMetadataStorage() + //defer cancelFunc() dataDir := WriteIndexTestDataCS3(t, Data, "Id") cfg := config.Config{ diff --git a/accounts/pkg/indexer/index/cs3/unique_test.go b/accounts/pkg/indexer/index/cs3/unique_test.go index 6cd42f9efc..ca6b76af63 100644 --- a/accounts/pkg/indexer/index/cs3/unique_test.go +++ b/accounts/pkg/indexer/index/cs3/unique_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/assert" ) -var ( - ctx, cancelFunc = context.WithCancel(context.Background()) -) +func init() { + go setupMetadataStorage() +} func setupMetadataStorage() { cfg := mcfg.New() @@ -27,12 +27,11 @@ func setupMetadataStorage() { Commands: []*cli.Command{command.StorageMetadata(cfg)}, } - _ = app.Command("storage-metadata").Run(cli.NewContext(&app, &flag.FlagSet{}, &cli.Context{Context: ctx})) + _ = app.Command("storage-metadata").Run(cli.NewContext(&app, &flag.FlagSet{}, &cli.Context{Context: context.Background()})) } func TestCS3UniqueIndex_FakeSymlink(t *testing.T) { - go setupMetadataStorage() - defer cancelFunc() + //go setupMetadataStorage() dataDir := WriteIndexTestDataCS3(t,Data, "Id") cfg := config.Config{ @@ -80,11 +79,12 @@ func TestCS3UniqueIndex_FakeSymlink(t *testing.T) { assert.Equal(t, searchRes[0], "abcdefg-123") _ = os.RemoveAll(dataDir) + + //cancelFunc() } func TestCS3UniqueIndexSearch(t *testing.T) { - go setupMetadataStorage() - defer cancelFunc() + //go setupMetadataStorage() dataDir := WriteIndexTestDataCS3(t, Data, "Id") cfg := config.Config{ @@ -126,4 +126,6 @@ func TestCS3UniqueIndexSearch(t *testing.T) { t.Log(res) _ = os.RemoveAll(dataDir) + + //cancelFunc() }