From a3e40a74714f97e4dcf4bb7f0779931823855cdf Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Fri, 28 Aug 2026 18:43:14 +0200 Subject: [PATCH] test(search): run the parity suite against the current main Move the OpenSearch test helpers to services/search/internal/opensearchtest so the parity package can import them, and drop the index generation and clock patch the suite was written against, neither exists on main yet. --- .../internal/test => internal/opensearchtest}/helper.go | 0 .../internal/test => internal/opensearchtest}/os.go | 0 .../internal/test => internal/opensearchtest}/suite.go | 0 .../internal/test => internal/opensearchtest}/test.go | 0 .../internal/test => internal/opensearchtest}/testdata.go | 0 .../opensearchtest}/testdata/resource_file.json | 0 .../opensearchtest}/testdata/resource_folder.json | 0 .../opensearchtest}/testdata/resource_root.json | 0 services/search/pkg/opensearch/backend_test.go | 2 +- services/search/pkg/opensearch/index_test.go | 2 +- .../pkg/opensearch/internal/convert/kql_expand_test.go | 2 +- .../pkg/opensearch/internal/convert/kql_transpile_test.go | 2 +- .../pkg/opensearch/internal/convert/opensearch_test.go | 2 +- .../search/pkg/opensearch/internal/osu/query_bool_test.go | 2 +- .../internal/osu/query_full_text_match_phrase_test.go | 2 +- .../opensearch/internal/osu/query_term_level_ids_test.go | 2 +- .../opensearch/internal/osu/query_term_level_range_test.go | 2 +- .../opensearch/internal/osu/query_term_level_term_test.go | 2 +- .../internal/osu/query_term_level_wildcard_test.go | 2 +- .../search/pkg/opensearch/internal/osu/request_test.go | 2 +- services/search/pkg/opensearch/opensearch_test.go | 2 +- services/search/pkg/parity/engines_test.go | 3 ++- services/search/pkg/parity/parity_test.go | 7 ++----- 23 files changed, 17 insertions(+), 19 deletions(-) rename services/search/{pkg/opensearch/internal/test => internal/opensearchtest}/helper.go (100%) rename services/search/{pkg/opensearch/internal/test => internal/opensearchtest}/os.go (100%) rename services/search/{pkg/opensearch/internal/test => internal/opensearchtest}/suite.go (100%) rename services/search/{pkg/opensearch/internal/test => internal/opensearchtest}/test.go (100%) rename services/search/{pkg/opensearch/internal/test => internal/opensearchtest}/testdata.go (100%) rename services/search/{pkg/opensearch/internal/test => internal/opensearchtest}/testdata/resource_file.json (100%) rename services/search/{pkg/opensearch/internal/test => internal/opensearchtest}/testdata/resource_folder.json (100%) rename services/search/{pkg/opensearch/internal/test => internal/opensearchtest}/testdata/resource_root.json (100%) diff --git a/services/search/pkg/opensearch/internal/test/helper.go b/services/search/internal/opensearchtest/helper.go similarity index 100% rename from services/search/pkg/opensearch/internal/test/helper.go rename to services/search/internal/opensearchtest/helper.go diff --git a/services/search/pkg/opensearch/internal/test/os.go b/services/search/internal/opensearchtest/os.go similarity index 100% rename from services/search/pkg/opensearch/internal/test/os.go rename to services/search/internal/opensearchtest/os.go diff --git a/services/search/pkg/opensearch/internal/test/suite.go b/services/search/internal/opensearchtest/suite.go similarity index 100% rename from services/search/pkg/opensearch/internal/test/suite.go rename to services/search/internal/opensearchtest/suite.go diff --git a/services/search/pkg/opensearch/internal/test/test.go b/services/search/internal/opensearchtest/test.go similarity index 100% rename from services/search/pkg/opensearch/internal/test/test.go rename to services/search/internal/opensearchtest/test.go diff --git a/services/search/pkg/opensearch/internal/test/testdata.go b/services/search/internal/opensearchtest/testdata.go similarity index 100% rename from services/search/pkg/opensearch/internal/test/testdata.go rename to services/search/internal/opensearchtest/testdata.go diff --git a/services/search/pkg/opensearch/internal/test/testdata/resource_file.json b/services/search/internal/opensearchtest/testdata/resource_file.json similarity index 100% rename from services/search/pkg/opensearch/internal/test/testdata/resource_file.json rename to services/search/internal/opensearchtest/testdata/resource_file.json diff --git a/services/search/pkg/opensearch/internal/test/testdata/resource_folder.json b/services/search/internal/opensearchtest/testdata/resource_folder.json similarity index 100% rename from services/search/pkg/opensearch/internal/test/testdata/resource_folder.json rename to services/search/internal/opensearchtest/testdata/resource_folder.json diff --git a/services/search/pkg/opensearch/internal/test/testdata/resource_root.json b/services/search/internal/opensearchtest/testdata/resource_root.json similarity index 100% rename from services/search/pkg/opensearch/internal/test/testdata/resource_root.json rename to services/search/internal/opensearchtest/testdata/resource_root.json diff --git a/services/search/pkg/opensearch/backend_test.go b/services/search/pkg/opensearch/backend_test.go index 29859f751a..850b9a7bfa 100644 --- a/services/search/pkg/opensearch/backend_test.go +++ b/services/search/pkg/opensearch/backend_test.go @@ -14,8 +14,8 @@ import ( "github.com/opencloud-eu/reva/v2/pkg/errtypes" searchService "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/search/v0" + opensearchtest "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch" - opensearchtest "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" "github.com/opencloud-eu/opencloud/services/search/pkg/search" ) diff --git a/services/search/pkg/opensearch/index_test.go b/services/search/pkg/opensearch/index_test.go index f4b5451a9d..6a813572a2 100644 --- a/services/search/pkg/opensearch/index_test.go +++ b/services/search/pkg/opensearch/index_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" "github.com/tidwall/sjson" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestIndexManager(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/convert/kql_expand_test.go b/services/search/pkg/opensearch/internal/convert/kql_expand_test.go index 49218d5aa5..1b3cb0b914 100644 --- a/services/search/pkg/opensearch/internal/convert/kql_expand_test.go +++ b/services/search/pkg/opensearch/internal/convert/kql_expand_test.go @@ -9,7 +9,7 @@ import ( "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/convert" "github.com/opencloud-eu/opencloud/pkg/ast" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" ) func TestExpandKQLAST(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/convert/kql_transpile_test.go b/services/search/pkg/opensearch/internal/convert/kql_transpile_test.go index 9dbf7f2b9a..1b627c8133 100644 --- a/services/search/pkg/opensearch/internal/convert/kql_transpile_test.go +++ b/services/search/pkg/opensearch/internal/convert/kql_transpile_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/opencloud-eu/opencloud/pkg/ast" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/convert" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/osu" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestTranspileKQLToOpenSearch(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/convert/opensearch_test.go b/services/search/pkg/opensearch/internal/convert/opensearch_test.go index bf80b7058f..d2fba09c70 100644 --- a/services/search/pkg/opensearch/internal/convert/opensearch_test.go +++ b/services/search/pkg/opensearch/internal/convert/opensearch_test.go @@ -10,8 +10,8 @@ import ( "github.com/opencloud-eu/opencloud/pkg/conversions" searchMessage "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/messages/search/v0" + opensearchtest "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/convert" - opensearchtest "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" "github.com/opencloud-eu/opencloud/services/search/pkg/search" ) diff --git a/services/search/pkg/opensearch/internal/osu/query_bool_test.go b/services/search/pkg/opensearch/internal/osu/query_bool_test.go index 3f33d4c1f4..d101cc5b7e 100644 --- a/services/search/pkg/opensearch/internal/osu/query_bool_test.go +++ b/services/search/pkg/opensearch/internal/osu/query_bool_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/osu" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestBoolQuery(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/osu/query_full_text_match_phrase_test.go b/services/search/pkg/opensearch/internal/osu/query_full_text_match_phrase_test.go index 2fa712d039..b2c4b36a19 100644 --- a/services/search/pkg/opensearch/internal/osu/query_full_text_match_phrase_test.go +++ b/services/search/pkg/opensearch/internal/osu/query_full_text_match_phrase_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/osu" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestNewMatchPhraseQuery(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/osu/query_term_level_ids_test.go b/services/search/pkg/opensearch/internal/osu/query_term_level_ids_test.go index 1a15777649..ecfca2fff4 100644 --- a/services/search/pkg/opensearch/internal/osu/query_term_level_ids_test.go +++ b/services/search/pkg/opensearch/internal/osu/query_term_level_ids_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/osu" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestIDsQuery(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/osu/query_term_level_range_test.go b/services/search/pkg/opensearch/internal/osu/query_term_level_range_test.go index 0bb65fca73..43b6241768 100644 --- a/services/search/pkg/opensearch/internal/osu/query_term_level_range_test.go +++ b/services/search/pkg/opensearch/internal/osu/query_term_level_range_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/osu" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestRangeQuery(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/osu/query_term_level_term_test.go b/services/search/pkg/opensearch/internal/osu/query_term_level_term_test.go index c4e9e8f325..e4244bf0a8 100644 --- a/services/search/pkg/opensearch/internal/osu/query_term_level_term_test.go +++ b/services/search/pkg/opensearch/internal/osu/query_term_level_term_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/osu" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestTermQuery(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/osu/query_term_level_wildcard_test.go b/services/search/pkg/opensearch/internal/osu/query_term_level_wildcard_test.go index afc810e36d..e1a5f37088 100644 --- a/services/search/pkg/opensearch/internal/osu/query_term_level_wildcard_test.go +++ b/services/search/pkg/opensearch/internal/osu/query_term_level_wildcard_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/osu" - "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestWildcardQuery(t *testing.T) { diff --git a/services/search/pkg/opensearch/internal/osu/request_test.go b/services/search/pkg/opensearch/internal/osu/request_test.go index 535f05bd82..f8e0010258 100644 --- a/services/search/pkg/opensearch/internal/osu/request_test.go +++ b/services/search/pkg/opensearch/internal/osu/request_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + opensearchtest "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/osu" - opensearchtest "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) func TestRequestBody(t *testing.T) { diff --git a/services/search/pkg/opensearch/opensearch_test.go b/services/search/pkg/opensearch/opensearch_test.go index 6278ce6d66..cd5fb6fdbc 100644 --- a/services/search/pkg/opensearch/opensearch_test.go +++ b/services/search/pkg/opensearch/opensearch_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" + opensearchtest "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" "github.com/opencloud-eu/opencloud/services/search/pkg/config" - opensearchtest "github.com/opencloud-eu/opencloud/services/search/pkg/opensearch/internal/test" ) var defaultConfig *config.Config diff --git a/services/search/pkg/parity/engines_test.go b/services/search/pkg/parity/engines_test.go index b91fcedf07..74091a3acf 100644 --- a/services/search/pkg/parity/engines_test.go +++ b/services/search/pkg/parity/engines_test.go @@ -58,7 +58,8 @@ func newOpenSearch(t *testing.T, index string, fixtures []search.Resource) testE t.Helper() tc := opensearchtest.NewDefaultTestClient(t, defaultConfig.Engine.OpenSearch.Client) - versioned := opensearch.IndexName(index) + // main has no index generations yet, the index name is used as given + versioned := index if err := tc.IndicesReset(t.Context(), []string{versioned}); err != nil { return testEngine{name: "opensearch", unavailable: err.Error()} diff --git a/services/search/pkg/parity/parity_test.go b/services/search/pkg/parity/parity_test.go index b5b149cb46..d9238dbde4 100644 --- a/services/search/pkg/parity/parity_test.go +++ b/services/search/pkg/parity/parity_test.go @@ -6,13 +6,11 @@ import ( "os" "strings" "testing" - "time" "github.com/stretchr/testify/require" "github.com/opencloud-eu/reva/v2/pkg/errtypes" - "github.com/opencloud-eu/opencloud/pkg/kql" searchMessage "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/messages/search/v0" searchService "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/search/v0" "github.com/opencloud-eu/opencloud/services/search/internal/opensearchtest" @@ -23,9 +21,8 @@ import ( var defaultConfig *config.Config func TestMain(m *testing.M) { - // the fixtures are stamped with fixtureNow, holding the clock still keeps - // "today" on their side of midnight for the whole run - kql.PatchTimeNow(func() time.Time { return fixtureNow }) + // the fixtures are stamped with fixtureNow; a run crossing midnight would + // see "today" move away from them (RANGE-05/06) cfg, done, err := opensearchtest.SetupTests(context.Background()) if err != nil {