From 901c5b89216886e1b7dee1125105ce04f4a6c7ba Mon Sep 17 00:00:00 2001 From: Sugu Sougoumarane Date: Wed, 17 Jun 2020 19:03:54 -0700 Subject: [PATCH] tests: deflake TestConsolidation Fixes #6235 Signed-off-by: Sugu Sougoumarane --- go/vt/vttablet/endtoend/misc_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/go/vt/vttablet/endtoend/misc_test.go b/go/vt/vttablet/endtoend/misc_test.go index 6b21c05ee6c..ffa1aaf2a6b 100644 --- a/go/vt/vttablet/endtoend/misc_test.go +++ b/go/vt/vttablet/endtoend/misc_test.go @@ -272,8 +272,10 @@ func TestConsolidation(t *testing.T) { defer framework.Server.SetPoolSize(framework.Server.PoolSize()) framework.Server.SetPoolSize(1) + const tag = "Waits/Histograms/Consolidations/Count" + for sleep := 0.1; sleep < 10.0; sleep *= 2 { - vstart := framework.DebugVars() + want := framework.FetchInt(framework.DebugVars(), tag) + 1 var wg sync.WaitGroup wg.Add(2) go func() { @@ -288,10 +290,10 @@ func TestConsolidation(t *testing.T) { }() wg.Wait() - vend := framework.DebugVars() - compareIntDiff(t, vend, "Waits/Histograms/Consolidations/Count", vstart, 1) - t.Logf("DebugVars properly incremented with sleep=%v", sleep) - return + if framework.FetchInt(framework.DebugVars(), tag) == want { + return + } + t.Logf("Consolidation didn't succeed with sleep for %v, trying a longer sleep", sleep) } t.Error("DebugVars for consolidation not incremented") }