Merge pull request #18392 from serathius/robustness-deflake-watch-pro…

…gress Remove flake caused failpoint in watch disrupting progress notifies
etcd-io · Aug 2, 2024 · 8ac9ce8 · 8ac9ce8
2 parents ca2d91c + fdf8fde
commit 8ac9ce8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tests/robustness/main_test.go b/tests/robustness/main_test.go
@@ -96,8 +96,11 @@ func testRobustness(ctx context.Context, t *testing.T, lg *zap.Logger, s testSce
 		t.Fatal(err)
 	}
 
-	watchProgressNotifyEnabled := c.Cfg.ServerConfig.ExperimentalWatchProgressNotifyInterval != 0
-	validateGotAtLeastOneProgressNotify(t, r.Client, s.watch.requestProgress || watchProgressNotifyEnabled)
+	failpointImpactingWatch := s.failpoint == failpoint.SleepBeforeSendWatchResponse
+	if !failpointImpactingWatch {
+		watchProgressNotifyEnabled := c.Cfg.ServerConfig.ExperimentalWatchProgressNotifyInterval != 0
+		validateGotAtLeastOneProgressNotify(t, r.Client, s.watch.requestProgress || watchProgressNotifyEnabled)
+	}
 	validateConfig := validate.Config{ExpectRevisionUnique: s.traffic.ExpectUniqueRevision()}
 	r.Visualize = validate.ValidateAndReturnVisualize(t, lg, validateConfig, r.Client, persistedRequests, 5*time.Minute)