From 563309cb34c14e7b0d283b1ec6073c9613d4c8e0 Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Thu, 16 Mar 2023 17:32:07 +0000 Subject: [PATCH] kvserver: unskip `TestNewTruncateDecision` Epic: none Release note: None --- pkg/kv/kvserver/raft_log_queue_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/kv/kvserver/raft_log_queue_test.go b/pkg/kv/kvserver/raft_log_queue_test.go index e8384a5c471b..cb3737cb2031 100644 --- a/pkg/kv/kvserver/raft_log_queue_test.go +++ b/pkg/kv/kvserver/raft_log_queue_test.go @@ -24,7 +24,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvpb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" - "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -450,7 +449,11 @@ func TestNewTruncateDecision(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - skip.WithIssue(t, 38584) + // Unquiescing can add spurious empty log entries. Just disable it. + testingDisableQuiescence = true + defer func() { + testingDisableQuiescence = false + }() ctx := context.Background() stopper := stop.NewStopper()