From 4bcd5a5a5237224fcc86a36194d9822e6093f712 Mon Sep 17 00:00:00 2001 From: phuoc Date: Tue, 20 Aug 2024 16:57:40 +0700 Subject: [PATCH 1/2] s2 should see its status as alive after fixing issue #18 --- serf/serf_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/serf/serf_test.go b/serf/serf_test.go index 8bc66262f..6dfbc3bbb 100644 --- a/serf/serf_test.go +++ b/serf/serf_test.go @@ -1699,17 +1699,17 @@ func TestSerf_joinLeaveJoin(t *testing.T) { r.Fatalf("s2 members: %d", s2.NumNodes()) } - // s1 should see the node as alive - mems := s1.Members() - anyLeft := false + // s2 should see the itself as alive + mems := s2.Members() + anyLeaving := false for _, m := range mems { - if m.Status == StatusLeft { - anyLeft = true + if m.Status == StatusLeaving { + anyLeaving = true break } } - if anyLeft { - r.Fatalf("all nodes should be alive!") + if anyLeaving { + t.Fatalf("all nodes should be alive!") } }) } From 033ad707f0e194c951a93a23211af8afe2c3f536 Mon Sep 17 00:00:00 2001 From: phuoc Date: Wed, 21 Aug 2024 08:13:23 +0700 Subject: [PATCH 2/2] test for s1 members should not be removed --- serf/serf_test.go | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/serf/serf_test.go b/serf/serf_test.go index 6dfbc3bbb..8104bf15b 100644 --- a/serf/serf_test.go +++ b/serf/serf_test.go @@ -1699,17 +1699,30 @@ func TestSerf_joinLeaveJoin(t *testing.T) { r.Fatalf("s2 members: %d", s2.NumNodes()) } - // s2 should see the itself as alive - mems := s2.Members() - anyLeaving := false + // s1 should see the all nodes as alive + mems := s1.Members() + anyNotAlive := false + for _, m := range mems { + if m.Status != StatusAlive { + anyNotAlive = true + break + } + } + if anyNotAlive { + r.Fatalf("all nodes should be alive!") + } + + // s2 should see the all nodes as alive + mems = s2.Members() + anyNotAlive = false for _, m := range mems { - if m.Status == StatusLeaving { - anyLeaving = true + if m.Status != StatusAlive { + anyNotAlive = true break } } - if anyLeaving { - t.Fatalf("all nodes should be alive!") + if anyNotAlive { + r.Fatalf("all nodes should be alive!") } }) }