diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go index 3a02308df2..d681d85cfe 100644 --- a/agent/consul/server_test.go +++ b/agent/consul/server_test.go @@ -767,10 +767,10 @@ func TestServer_RevokeLeadershipIdempotent(t *testing.T) { dir1, s1 := testServer(t) defer os.RemoveAll(dir1) defer s1.Shutdown() - + testrpc.WaitForLeader(t, s1.RPC, "dc1") - err:= s1.revokeLeadership() + err := s1.revokeLeadership() if err != nil { t.Fatal(err) } diff --git a/tlsutil/config.go b/tlsutil/config.go index 73b8fa362b..62ad910382 100644 --- a/tlsutil/config.go +++ b/tlsutil/config.go @@ -382,7 +382,7 @@ func ParseCiphers(cipherStr string) ([]uint16, error) { "TLS_RSA_WITH_3DES_EDE_CBC_SHA": tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA, "TLS_RSA_WITH_RC4_128_SHA": tls.TLS_RSA_WITH_RC4_128_SHA, "TLS_ECDHE_RSA_WITH_RC4_128_SHA": tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA, - "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA": tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA + "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA": tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, } for _, cipher := range ciphers { if v, ok := cipherMap[cipher]; ok { diff --git a/tlsutil/config_test.go b/tlsutil/config_test.go index ab4a850468..11e1a131f1 100644 --- a/tlsutil/config_test.go +++ b/tlsutil/config_test.go @@ -534,7 +534,7 @@ func TestConfig_ParseCiphers(t *testing.T) { "TLS_RSA_WITH_3DES_EDE_CBC_SHA", "TLS_RSA_WITH_RC4_128_SHA", "TLS_ECDHE_RSA_WITH_RC4_128_SHA", - "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA" + "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", }, ",") ciphers := []uint16{ tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, @@ -558,7 +558,7 @@ func TestConfig_ParseCiphers(t *testing.T) { tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA, tls.TLS_RSA_WITH_RC4_128_SHA, tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA, - tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA + tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, } v, err := ParseCiphers(testOk) if err != nil {