Fix serf.TestSerf_RemoveFailed_eventsLeave flake

The test was not sleeping long enough, and was frequently missing the 'EventMemberFailed' event. By sleeping a bit logner this test seems to pass reliably.
hashicorp · Jun 9, 2021 · ac85eef · ac85eef
1 parent c99e25f
commit ac85eef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/serf/event_test.go b/serf/event_test.go
@@ -9,6 +9,7 @@ import (
 // testEvents tests that the given node had the given sequence of events
 // on the event channel.
 func testEvents(t *testing.T, ch <-chan Event, node string, expected []EventType) {
+	t.Helper()
 	actual := make([]EventType, 0, len(expected))
 
 TESTEVENTLOOP:

diff --git a/serf/serf_test.go b/serf/serf_test.go
@@ -459,7 +459,7 @@ func TestSerf_RemoveFailed_eventsLeave(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	time.Sleep(s2Config.MemberlistConfig.ProbeInterval * 3)
+	time.Sleep(s2Config.MemberlistConfig.ProbeInterval * 5)
 
 	if err := s1.RemoveFailedNode(s2Config.NodeName); err != nil {
 		t.Fatalf("err: %v", err)
@@ -2950,7 +2950,7 @@ func waitUntilNumNodes(t *testing.T, desiredNodes int, serfs ...*Serf) {
 		t.Helper()
 		for i, s := range serfs {
 			if n := s.NumNodes(); desiredNodes != n {
-				r.Fatalf("s%d got %d expected %d", (i + 1), n, desiredNodes)
+				r.Fatalf("s%d got %d expected %d", i+1, n, desiredNodes)
 			}
 		}
 	})