From 3d9b15fbf098c90cb8866b2751efdf5f5f727a31 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 11 Jan 2024 13:10:47 -0500 Subject: [PATCH] 20318: Fix settled condition. Intention was to stop iterating when *all* of the keepstore servers need 0 pulls, but the code as written stops on the N>1st iteration when *any* of the keepstore servers need 0 pulls. This caused a false negative when it took more than one iteration for keepstore to complete the requested pulls. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/keep-balance/integration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go index 18cfd12106..20d0040b1f 100644 --- a/services/keep-balance/integration_test.go +++ b/services/keep-balance/integration_test.go @@ -103,7 +103,7 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) { if iter == 0 { c.Check(logBuf.String(), check.Matches, `(?ms).*ChangeSet{Pulls:1.*`) c.Check(logBuf.String(), check.Not(check.Matches), `(?ms).*ChangeSet{.*Trashes:[^0]}*`) - } else if strings.Contains(logBuf.String(), "ChangeSet{Pulls:0") { + } else if !strings.Contains(logBuf.String(), "ChangeSet{Pulls:1") { break } time.Sleep(200 * time.Millisecond) -- 2.30.2