Skip to content

Commit f1c9434

Browse files
committed
use bazel image for tidb-test
Signed-off-by: Weizhen Wang <[email protected]>
1 parent 7130473 commit f1c9434

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

server/tidb_serial_test.go

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package server
1616

1717
import (
1818
"context"
19+
"crypto/tls"
1920
"crypto/x509"
2021
"os"
2122
"path/filepath"
@@ -33,6 +34,26 @@ import (
3334
"github.com/stretchr/testify/require"
3435
)
3536

37+
// isTLSExpiredError checks error is caused by TLS expired.
38+
func isTLSExpiredError(err error) bool {
39+
err = errors.Cause(err)
40+
switch inval := err.(type) {
41+
case x509.CertificateInvalidError:
42+
if inval.Reason != x509.Expired {
43+
return false
44+
}
45+
case *tls.CertificateVerificationError:
46+
invalid, ok := inval.Err.(x509.CertificateInvalidError)
47+
if !ok || invalid.Reason != x509.Expired {
48+
return false
49+
}
50+
return true
51+
default:
52+
return false
53+
}
54+
return true
55+
}
56+
3657
// this test will change `kv.TxnTotalSizeLimit` which may affect other test suites,
3758
// so we must make it running in serial.
3859
func TestLoadData1(t *testing.T) {
@@ -263,9 +284,9 @@ func TestTLSVerify(t *testing.T) {
263284
require.NoError(t, err)
264285
cli.runTestRegression(t, connOverrider, "TLSRegression")
265286

266-
require.False(t, util.IsTLSExpiredError(errors.New("unknown test")))
267-
require.False(t, util.IsTLSExpiredError(x509.CertificateInvalidError{Reason: x509.CANotAuthorizedForThisName}))
268-
require.True(t, util.IsTLSExpiredError(x509.CertificateInvalidError{Reason: x509.Expired}))
287+
require.False(t, isTLSExpiredError(errors.New("unknown test")))
288+
require.False(t, isTLSExpiredError(x509.CertificateInvalidError{Reason: x509.CANotAuthorizedForThisName}))
289+
require.True(t, isTLSExpiredError(x509.CertificateInvalidError{Reason: x509.Expired}))
269290

270291
_, _, err = util.LoadTLSCertificates("", "wrong key", "wrong cert", true, 528)
271292
require.Error(t, err)
@@ -553,6 +574,6 @@ func TestReloadTLS(t *testing.T) {
553574
}
554575
err = cli.runTestTLSConnection(t, connOverrider)
555576
require.NotNil(t, err)
556-
require.Truef(t, util.IsTLSExpiredError(err), "real error is %+v", err)
577+
require.Truef(t, isTLSExpiredError(err), "real error is %+v", err)
557578
server.Close()
558579
}

util/misc.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -551,26 +551,6 @@ func LoadTLSCertificates(ca, key, cert string, autoTLS bool, rsaKeySize int) (tl
551551
return
552552
}
553553

554-
// IsTLSExpiredError checks error is caused by TLS expired.
555-
func IsTLSExpiredError(err error) bool {
556-
err = errors.Cause(err)
557-
switch inval := err.(type) {
558-
case x509.CertificateInvalidError:
559-
if inval.Reason != x509.Expired {
560-
return false
561-
}
562-
case *tls.CertificateVerificationError:
563-
invalid, ok := inval.Err.(x509.CertificateInvalidError)
564-
if !ok || invalid.Reason != x509.Expired {
565-
return false
566-
}
567-
return true
568-
default:
569-
return false
570-
}
571-
return true
572-
}
573-
574554
var (
575555
internalClientInit sync.Once
576556
internalHTTPClient *http.Client

0 commit comments

Comments
 (0)