From def7f3405578d09bf3d5a9ea8438b373268e51de Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 26 Jun 2017 16:58:18 -0400 Subject: [PATCH] Fix tls config copy in dial test --- staging/src/k8s.io/apimachinery/pkg/util/proxy/BUILD | 1 + .../src/k8s.io/apimachinery/pkg/util/proxy/dial_test.go | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/proxy/BUILD b/staging/src/k8s.io/apimachinery/pkg/util/proxy/BUILD index d8c7ef55cb..558c60a491 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/proxy/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/util/proxy/BUILD @@ -21,6 +21,7 @@ go_test( "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", "//vendor/golang.org/x/net/websocket:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library", ], diff --git a/staging/src/k8s.io/apimachinery/pkg/util/proxy/dial_test.go b/staging/src/k8s.io/apimachinery/pkg/util/proxy/dial_test.go index f268ecd80e..8b9f78e4d1 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/proxy/dial_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/proxy/dial_test.go @@ -28,6 +28,7 @@ import ( "strings" "testing" + "k8s.io/apimachinery/pkg/util/diff" utilnet "k8s.io/apimachinery/pkg/util/net" ) @@ -96,7 +97,10 @@ func TestDialURL(t *testing.T) { ts.TLS = &tls.Config{Certificates: []tls.Certificate{cert}} ts.StartTLS() - tlsConfigCopy := tc.TLSConfig + // Make a copy of the config + tlsConfigCopy := tc.TLSConfig.Clone() + // Clone() mutates the receiver (!), so also call it on the copy + tlsConfigCopy.Clone() transport := &http.Transport{ Dial: tc.Dial, TLSClientConfig: tlsConfigCopy, @@ -125,7 +129,7 @@ func TestDialURL(t *testing.T) { // Make sure dialing doesn't mutate the transport's TLSConfig if !reflect.DeepEqual(tc.TLSConfig, tlsConfigCopy) { - t.Errorf("%s: transport's copy of TLSConfig was mutated\n%#v\n\n%#v", k, tc.TLSConfig, tlsConfigCopy) + t.Errorf("%s: transport's copy of TLSConfig was mutated\n%s", k, diff.ObjectReflectDiff(tc.TLSConfig, tlsConfigCopy)) } if err != nil {