From 9dbf77fad13ebf3399176ef1f569f7ef56d2c120 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 16 Oct 2020 09:57:08 +0200 Subject: [PATCH] Fix more index tests --- accounts/pkg/indexer/index/disk/non_unique_test.go | 3 ++- accounts/pkg/service/v0/groups.go | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/accounts/pkg/indexer/index/disk/non_unique_test.go b/accounts/pkg/indexer/index/disk/non_unique_test.go index 60352bac2..a60c3474c 100644 --- a/accounts/pkg/indexer/index/disk/non_unique_test.go +++ b/accounts/pkg/indexer/index/disk/non_unique_test.go @@ -52,9 +52,10 @@ func TestNonUniqueIndexDelete(t *testing.T) { sut, dataPath := getNonUniqueIdxSut(t, Pet{}, "Color") assert.FileExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green/goefe-789", GetTypeFQN(Pet{})))) - err := sut.Remove("goefe-789", "") + err := sut.Remove("goefe-789", "Green") assert.NoError(t, err) assert.NoFileExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green/goefe-789", GetTypeFQN(Pet{})))) + assert.FileExists(t, path.Join(dataPath, fmt.Sprintf("index.disk/non_unique.%v.Color/Green/xadaf-189", GetTypeFQN(Pet{})))) _ = os.RemoveAll(dataPath) } diff --git a/accounts/pkg/service/v0/groups.go b/accounts/pkg/service/v0/groups.go index f84fed869..cfa0e26ce 100644 --- a/accounts/pkg/service/v0/groups.go +++ b/accounts/pkg/service/v0/groups.go @@ -52,10 +52,6 @@ func (s Service) deflateMembers(g *proto.Group) { // ListGroups implements the GroupsServiceHandler interface func (s Service) ListGroups(c context.Context, in *proto.ListGroupsRequest, out *proto.ListGroupsResponse) (err error) { var searchResults []string - if err != nil { - s.log.Error().Err(err).Msg("could not execute bleve search") - return merrors.InternalServerError(s.id, "could not execute bleve search: %v", err.Error()) - } out.Groups = make([]*proto.Group, 0) if in.Query == "" { @@ -68,7 +64,6 @@ func (s Service) ListGroups(c context.Context, in *proto.ListGroupsRequest, out if len(match) == 2 { searchResults = []string{match[1]} } - */ for _, hit := range searchResults {