wait more in e2e test

Author: ndyakov

maintnotifications/e2e/command_runner_test.go

@@ -20,6 +20,7 @@ type CommandRunnerStats struct {
 
 // CommandRunner provides utilities for running commands during tests
 type CommandRunner struct {
+	executing      atomic.Bool
 	client         redis.UniversalClient
 	stopCh         chan struct{}
 	operationCount atomic.Int64
@@ -56,6 +57,10 @@ func (cr *CommandRunner) Close() {
 
 // FireCommandsUntilStop runs commands continuously until stop signal
 func (cr *CommandRunner) FireCommandsUntilStop(ctx context.Context) {
+	if !cr.executing.CompareAndSwap(false, true) {
+		return
+	}
+	defer cr.executing.Store(false)
 	fmt.Printf("[CR] Starting command runner...\n")
 	defer fmt.Printf("[CR] Command runner stopped\n")
 	// High frequency for timeout testing

maintnotifications/e2e/scenario_push_notifications_test.go

@@ -297,12 +297,6 @@ func TestPushNotifications(t *testing.T) {
 		// once moving is received, start a second client commands runner
 		p("Starting commands on second client")
 		go commandsRunner2.FireCommandsUntilStop(ctx)
-		defer func() {
-			// stop the second runner
-			commandsRunner2.Stop()
-			// destroy the second client
-			factory.Destroy("push-notification-client-2")
-		}()
 
 		p("Waiting for MOVING notification on second client")
 		matchNotif, fnd := tracker2.FindOrWaitForNotification("MOVING", 3*time.Minute)
@@ -393,11 +387,15 @@ func TestPushNotifications(t *testing.T) {
 
 	p("MOVING notification test completed successfully")
 
-	p("Executing commands and collecting logs for analysis... This will take 30 seconds...")
+	p("Executing commands and collecting logs for analysis... ")
 	go commandsRunner.FireCommandsUntilStop(ctx)
-	time.Sleep(time.Minute)
+	go commandsRunner2.FireCommandsUntilStop(ctx)
+	go commandsRunner3.FireCommandsUntilStop(ctx)
+	time.Sleep(30 * time.Second)
 	commandsRunner.Stop()
-	time.Sleep(time.Minute)
+	commandsRunner2.Stop()
+	commandsRunner3.Stop()
+	time.Sleep(5 * time.Minute)
 	allLogsAnalysis := logCollector.GetAnalysis()
 	trackerAnalysis := tracker.GetAnalysis()
 
@@ -473,7 +471,7 @@ func TestPushNotifications(t *testing.T) {
 
 	// unrelaxed (and relaxed) after moving wont be tracked by the hook, so we have to exclude it
 	if trackerAnalysis.UnrelaxedTimeoutCount != allLogsAnalysis.UnrelaxedTimeoutCount-allLogsAnalysis.UnrelaxedAfterMoving {
-		e("Expected %d unrelaxed timeouts, got %d", trackerAnalysis.UnrelaxedTimeoutCount, allLogsAnalysis.UnrelaxedTimeoutCount)
+		e("Expected %d unrelaxed timeouts, got %d", trackerAnalysis.UnrelaxedTimeoutCount, allLogsAnalysis.UnrelaxedTimeoutCount-allLogsAnalysis.UnrelaxedAfterMoving)
 	}
 	if trackerAnalysis.RelaxedTimeoutCount != allLogsAnalysis.RelaxedTimeoutCount-allLogsAnalysis.RelaxedPostHandoffCount {
 		e("Expected %d relaxed timeouts, got %d", trackerAnalysis.RelaxedTimeoutCount, allLogsAnalysis.RelaxedTimeoutCount)