Skip to content

Commit 115d6c2

Browse files
yuzefovichmw5h
andauthored
Merge pull request #153729 from cockroachdb/blathers/backport-release-24.1-153627
release-24.1: explain_test: deflake TestContentionTimeOnWrites (#153729) Co-Authored-By: Matt White <[email protected]>
2 parents 979a6a5 + 703d34b commit 115d6c2

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

pkg/sql/opt/exec/explain/output_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ func TestContentionTimeOnWrites(t *testing.T) {
235235
defer leaktest.AfterTest(t)()
236236
defer log.Scope(t).Close(t)
237237

238+
skip.UnderDuress(t, "see issue #153394")
239+
238240
ctx := context.Background()
239241
s, conn, _ := serverutils.StartServer(t, base.TestServerArgs{})
240242
defer s.Stopper().Stop(ctx)

0 commit comments

Comments
 (0)