Skip to content

Commit 9d497fb

Browse files
committed
security: disable DRPC for TestTLSCipherRestrict
This test was failing continuously, and we skipped it to unblock others. Since this occurs only for DRPC, we are disabling it only for that. We will perform a root cause analysis and enable it back. Release note: none Epic: none
1 parent eb654e4 commit 9d497fb

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pkg/security/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ go_test(
9494
"//pkg/server",
9595
"//pkg/testutils",
9696
"//pkg/testutils/serverutils",
97-
"//pkg/testutils/skip",
9897
"//pkg/util/envutil",
9998
"//pkg/util/leaktest",
10099
"//pkg/util/log",

pkg/security/tls_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/cockroachdb/cockroach/pkg/security/username"
2323
"github.com/cockroachdb/cockroach/pkg/testutils"
2424
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
25-
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
2625
"github.com/cockroachdb/cockroach/pkg/util/envutil"
2726
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
2827
"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -124,7 +123,6 @@ func verifyX509Cert(cert *x509.Certificate, dnsName string, roots *x509.CertPool
124123
func TestTLSCipherRestrict(t *testing.T) {
125124
defer leaktest.AfterTest(t)()
126125
defer log.Scope(t).Close(t)
127-
skip.WithIssue(t, 153802)
128126

129127
tests := []struct {
130128
name string
@@ -164,7 +162,9 @@ func TestTLSCipherRestrict(t *testing.T) {
164162
})()
165163
ctx := context.Background()
166164

167-
s := serverutils.StartServerOnly(t, base.TestServerArgs{})
165+
s := serverutils.StartServerOnly(t, base.TestServerArgs{
166+
DefaultDRPCOption: base.TestDRPCDisabled,
167+
})
168168
defer s.Stopper().Stop(ctx)
169169

170170
// set the custom test ciphers

0 commit comments

Comments
 (0)