github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Comment out calls to httptest.Server.Close() to work around

Browse Source 
https://github.com/golang/go/issues/12262 . See #19254 for
more details. This change should be reverted when we upgrade
to Go 1.6.
This commit is contained in:
David Oppenheimer
2016-01-10 14:39:32 -08:00
parent 6f50699b93
commit 8ac484793d
50 changed files with 410 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubectl/resource/builder_test.go
View File

@@ -280,7 +280,8 @@ func TestNamespaceOverride(t *testing.T) {
w.WriteHeader(http.StatusOK)
w.Write([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &api.Pod{ObjectMeta: api.ObjectMeta{Namespace: "foo", Name: "test"}})))
}))
defer s.Close()
// TODO: Uncomment when fix #19254
// defer s.Close()
b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClient()).
FilenameParam(false, s.URL).
@@ -310,7 +311,8 @@ func TestURLBuilder(t *testing.T) {
w.WriteHeader(http.StatusOK)
w.Write([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &api.Pod{ObjectMeta: api.ObjectMeta{Namespace: "foo", Name: "test"}})))
}))
defer s.Close()
// TODO: Uncomment when fix #19254
// defer s.Close()
b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClient()).
FilenameParam(false, s.URL).
@@ -334,7 +336,8 @@ func TestURLBuilderRequireNamespace(t *testing.T) {
w.WriteHeader(http.StatusOK)
w.Write([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &api.Pod{ObjectMeta: api.ObjectMeta{Namespace: "foo", Name: "test"}})))
}))
defer s.Close()
// TODO: Uncomment when fix #19254
// defer s.Close()
b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClient()).
FilenameParam(false, s.URL).