From 22d345a53452f71c2ce544311f5943f73b8e666f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 8 Jul 2025 00:56:51 -0300 Subject: [PATCH] sweepbatcher: fix flaky test Since bb837a4aecb3076ff63d78b929d50a610f25bc7a AddSweep loads sweeps so one of possible errors is sql.ErrTxDone. Full error that is fixed: > fetchSweeps failed: failed to load sweep 0000000000000000000101:1: > failed to fetch sweep data for 010101000000: > failed to fetch loop out for 010101000000: > sql: transaction has already been committed or rolled back --- sweepbatcher/sweep_batcher_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sweepbatcher/sweep_batcher_test.go b/sweepbatcher/sweep_batcher_test.go index 590d83ae..955b72ad 100644 --- a/sweepbatcher/sweep_batcher_test.go +++ b/sweepbatcher/sweep_batcher_test.go @@ -2,6 +2,7 @@ package sweepbatcher import ( "context" + "database/sql" "errors" "fmt" "os" @@ -3997,6 +3998,9 @@ func testSweepBatcherCloseDuringAdding(t *testing.T, store testStore, if errors.Is(err, context.Canceled) { break } + if errors.Is(err, sql.ErrTxDone) { + break + } require.NoError(t, err) } }()