Skip to content

Commit

Permalink
Merge pull request #14101 from serathius/fix-merge
Browse files Browse the repository at this point in the history
server: Fix broken code during merge
  • Loading branch information
ahrtr authored Jun 9, 2022
2 parents 5a7df03 + 72a84dd commit 05e4a5a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion server/etcdserver/api/v3compactor/periodic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func TestPeriodicSkipRevNotChange(t *testing.T) {
fc := clockwork.NewFakeClock()
rg := &fakeRevGetter{testutil.NewRecorderStreamWithWaitTimout(10 * time.Millisecond), 0}
compactable := &fakeCompactable{testutil.NewRecorderStreamWithWaitTimout(10 * time.Millisecond)}
tb := newPeriodic(zap.NewExample(), fc, retentionDuration, rg, compactable)
tb := newPeriodic(zaptest.NewLogger(t), fc, retentionDuration, rg, compactable)

tb.Run()
defer tb.Stop()
Expand Down

0 comments on commit 05e4a5a

Please sign in to comment.