github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +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

15
pkg/master/master_test.go
View File

@@ -400,7 +400,8 @@ func testInstallThirdPartyAPIListVersion(t *testing.T, version string) {
for _, test := range tests {
func() {
master, etcdserver, server, assert := initThirdParty(t, version)
defer server.Close()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer etcdserver.Terminate(t)
if test.items != nil {
@@ -509,7 +510,8 @@ func TestInstallThirdPartyAPIGet(t *testing.T) {
func testInstallThirdPartyAPIGetVersion(t *testing.T, version string) {
master, etcdserver, server, assert := initThirdParty(t, version)
defer server.Close()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer etcdserver.Terminate(t)
expectedObj := Foo{
@@ -556,7 +558,8 @@ func TestInstallThirdPartyAPIPost(t *testing.T) {
func testInstallThirdPartyAPIPostForVersion(t *testing.T, version string) {
master, etcdserver, server, assert := initThirdParty(t, version)
defer server.Close()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer etcdserver.Terminate(t)
inputObj := Foo{
@@ -621,7 +624,8 @@ func TestInstallThirdPartyAPIDelete(t *testing.T) {
func testInstallThirdPartyAPIDeleteVersion(t *testing.T, version string) {
master, etcdserver, server, assert := initThirdParty(t, version)
defer server.Close()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer etcdserver.Terminate(t)
expectedObj := Foo{
@@ -698,7 +702,8 @@ func TestInstallThirdPartyResourceRemove(t *testing.T) {
func testInstallThirdPartyResourceRemove(t *testing.T, version string) {
master, etcdserver, server, assert := initThirdParty(t, version)
defer server.Close()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer etcdserver.Terminate(t)
expectedObj := Foo{