From f4f41b60a71624627753eaac1f36e5fe641337d9 Mon Sep 17 00:00:00 2001 From: kmetin Date: Fri, 3 Nov 2023 18:18:46 +0300 Subject: [PATCH] revert changes that fails start tests --- .../migration/start_stages_it_test.go | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/base/commands/migration/start_stages_it_test.go b/base/commands/migration/start_stages_it_test.go index 8930a737..91ebf229 100644 --- a/base/commands/migration/start_stages_it_test.go +++ b/base/commands/migration/start_stages_it_test.go @@ -4,11 +4,13 @@ package migration_test import ( "context" + "encoding/json" "errors" "fmt" "os" "sync" "testing" + "time" hz "github.com/hazelcast/hazelcast-go-client" "github.com/hazelcast/hazelcast-go-client/serialization" @@ -55,8 +57,6 @@ func startMigrationTest(t *testing.T, expectedErr error, statusMapStateFiles []s tcx := it.TestContext{T: t} ctx := context.Background() tcx.Tester(func(tcx it.TestContext) { - migration.MigrationIDGeneratorFunc = migrationIDFunc - mID := migrationIDFunc() ci := hz.NewClientInternal(tcx.Client) createMapping(ctx, tcx) createMemberLogs(t, ctx, ci) @@ -69,6 +69,9 @@ func startMigrationTest(t *testing.T, expectedErr error, statusMapStateFiles []s defer wg.Done() execErr = tcx.CLC().Execute(ctx, "start", "dmt-config", "--yes", "-o", outDir) }) + c := make(chan string) + go findMigrationID(ctx, tcx, c) + mID := <-c wg.Add(1) go migrationRunner(t, ctx, tcx, mID, &wg, statusMapStateFiles) wg.Wait() @@ -110,3 +113,16 @@ func createMapping(ctx context.Context, tcx it.TestContext) { func migrationIDFunc() string { return "e6e928d3-63af-4e72-8c42-0bfcf0ab6cf7" } + +func findMigrationID(ctx context.Context, tcx it.TestContext, c chan string) { + q := MustValue(tcx.Client.GetQueue(ctx, migration.StartQueueName)) + var b migration.ConfigBundle + for { + v := MustValue(q.PollWithTimeout(ctx, time.Second)) + if v != nil { + Must(json.Unmarshal(v.(serialization.JSON), &b)) + c <- b.MigrationID + break + } + } +}