wait more in e2e test

Author: ndyakov

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)
@@ -375,7 +369,6 @@ func TestPushNotifications(t *testing.T) {
 			p("[NOTICE] Expected timeS < 15, got %d", mNotifTimeS)
 		}
 	}
-	commandsRunner3.Stop()
 	// Wait for the goroutine to complete and check for errors
 	if err := <-errChan; err != nil {
 		ef("Second client goroutine error: %v", err)
@@ -395,9 +388,13 @@ func TestPushNotifications(t *testing.T) {
 
 	p("Executing commands and collecting logs for analysis... This will take 30 seconds...")
 	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 +470,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)