fix Yuce's PR comments

hazelcast · Nov 3, 2023 · e4a7c2c · e4a7c2c
1 parent f47341f
commit e4a7c2c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/base/commands/migration/estimate.go b/base/commands/migration/estimate.go
@@ -24,11 +24,9 @@ func (e EstimateCmd) Init(cc plug.InitContext) error {
 
 func (e EstimateCmd) Exec(ctx context.Context, ec plug.ExecContext) error {
 	ec.PrintlnUnnecessary("")
-	ec.PrintlnUnnecessary(`Hazelcast Data Migration Tool v5.3.0
-(c) 2023 Hazelcast, Inc.
+	ec.PrintlnUnnecessary(fmt.Sprintf(`%s
 
-Estimation usually ends within 15 seconds.
-`)
+Estimation usually ends within 15 seconds.`, banner))
 	mID := MakeMigrationID()
 	stages, err := NewEstimateStages(ec.Logger(), mID, ec.GetStringArg(argDMTConfig))
 	if err != nil {

diff --git a/base/commands/migration/estimate_it_test.go b/base/commands/migration/estimate_it_test.go
@@ -25,30 +25,28 @@ func TestEstimate(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			check.Must(tcx.CLC().Execute(ctx, "estimate", "dmt-config"))
+			check.Must(tcx.CLC().Execute(ctx, "estimate", "testdata/dmt-config"))
 		}()
 		c := make(chan string)
 		go findEstimationID(ctx, tcx, c)
 		mID := <-c
-		go estimateRunner(t, ctx, tcx, mID)
+		go estimateRunner(ctx, tcx, mID)
 		wg.Wait()
 		tcx.AssertStdoutContains("OK Estimation completed successfully")
 	})
 }
 
-func estimateRunner(t *testing.T, ctx context.Context, tcx it.TestContext, migrationID string) {
+func estimateRunner(ctx context.Context, tcx it.TestContext, migrationID string) {
 	statusMap := check.MustValue(tcx.Client.GetMap(ctx, migration.StatusMapName))
 	b := check.MustValue(os.ReadFile("testdata/estimate/estimate_completed.json"))
-	it.Eventually(t, func() bool {
-		return statusMap.Set(ctx, migrationID, serialization.JSON(b)) == nil
-	})
+	check.Must(statusMap.Set(ctx, migrationID, serialization.JSON(b)))
 }
 
 func findEstimationID(ctx context.Context, tcx it.TestContext, c chan string) {
 	q := check.MustValue(tcx.Client.GetQueue(ctx, migration.EstimateQueueName))
 	var b migration.ConfigBundle
 	for {
-		v := check.MustValue(q.PollWithTimeout(ctx, time.Second))
+		v := check.MustValue(q.PollWithTimeout(ctx, 100*time.Millisecond))
 		if v != nil {
 			check.Must(json.Unmarshal(v.(serialization.JSON), &b))
 			c <- b.MigrationID

diff --git a/base/commands/migration/start_stages_it_test.go b/base/commands/migration/start_stages_it_test.go
@@ -67,7 +67,7 @@ func startMigrationTest(t *testing.T, expectedErr error, statusMapStateFiles []s
 		var execErr error
 		go tcx.WithReset(func() {
 			defer wg.Done()
-			execErr = tcx.CLC().Execute(ctx, "start", "dmt-config", "--yes", "-o", outDir)
+			execErr = tcx.CLC().Execute(ctx, "start", "testdata/dmt-config", "--yes", "-o", outDir)
 		})
 		c := make(chan string)
 		go findMigrationID(ctx, tcx, c)