Merge pull request #7837 from gyuho/tls-errors

integration: match more TLS errors for wrong certs
This commit is contained in:
Gyu-Ho Lee 2017-04-28 10:08:34 -07:00 committed by GitHub
commit 7239249155

View File

@ -1518,14 +1518,12 @@ func TestTLSReloadCopy(t *testing.T) {
for { for {
cc, err := ts.ClientConfig() cc, err := ts.ClientConfig()
if err != nil { if err != nil {
// from concurrent certs overwriting // errors in 'go/src/crypto/tls/tls.go'
switch err.Error() { // tls: private key does not match public key
case "tls: private key does not match public key": // tls: failed to find any PEM data in key input
fallthrough // tls: failed to find any PEM data in certificate input
case "tls: failed to find any PEM data in key input": t.Log(err)
continue continue
}
t.Fatal(err)
} }
cli, cerr := clientv3.New(clientv3.Config{ cli, cerr := clientv3.New(clientv3.Config{
Endpoints: []string{clus.Members[0].GRPCAddr()}, Endpoints: []string{clus.Members[0].GRPCAddr()},