github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24595 from zhouhaibing089/httpserverclose

Browse Source 
Automatic merge from submit-queue

Uncomment the code that caused by #19254

Fix https://github.com/kubernetes/kubernetes/issues/24546.

@lavalamp
This commit is contained in:
k8s-merge-robot
2016-04-28 01:41:16 -07:00
parent 04b70bc6c7 bf1a3f99c0
commit d0b887e4e0
53 changed files with 218 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/master/master_test.go
View File

@@ -587,8 +587,7 @@ func testInstallThirdPartyAPIListVersion(t *testing.T, version string) {
for _, test := range tests {
func() {
master, etcdserver, server, assert := initThirdParty(t, version)
// TODO: Uncomment when fix #19254
// defer server.Close()
defer server.Close()
defer etcdserver.Terminate(t)
if test.items != nil {
@@ -698,8 +697,7 @@ func TestInstallThirdPartyAPIGet(t *testing.T) {
func testInstallThirdPartyAPIGetVersion(t *testing.T, version string) {
master, etcdserver, server, assert := initThirdParty(t, version)
// TODO: Uncomment when fix #19254
// defer server.Close()
defer server.Close()
defer etcdserver.Terminate(t)
expectedObj := Foo{
@@ -746,8 +744,7 @@ func TestInstallThirdPartyAPIPost(t *testing.T) {
func testInstallThirdPartyAPIPostForVersion(t *testing.T, version string) {
master, etcdserver, server, assert := initThirdParty(t, version)
// TODO: Uncomment when fix #19254
// defer server.Close()
defer server.Close()
defer etcdserver.Terminate(t)
inputObj := Foo{
@@ -811,8 +808,7 @@ func TestInstallThirdPartyAPIDelete(t *testing.T) {
func testInstallThirdPartyAPIDeleteVersion(t *testing.T, version string) {
master, etcdserver, server, assert := initThirdParty(t, version)
// TODO: Uncomment when fix #19254
// defer server.Close()
defer server.Close()
defer etcdserver.Terminate(t)
expectedObj := Foo{
@@ -889,8 +885,7 @@ func TestInstallThirdPartyAPIListOptions(t *testing.T) {
func testInstallThirdPartyAPIListOptionsForVersion(t *testing.T, version string) {
_, etcdserver, server, assert := initThirdParty(t, version)
// TODO: Uncomment when fix #19254
// defer server.Close()
defer server.Close()
defer etcdserver.Terminate(t)
// send a GET request with query parameter
@@ -922,8 +917,7 @@ func TestInstallThirdPartyResourceRemove(t *testing.T) {
func testInstallThirdPartyResourceRemove(t *testing.T, version string) {
master, etcdserver, server, assert := initThirdParty(t, version)
// TODO: Uncomment when fix #19254
// defer server.Close()
defer server.Close()
defer etcdserver.Terminate(t)
expectedObj := Foo{
@@ -1044,8 +1038,7 @@ func TestIsTunnelSyncHealthy(t *testing.T) {
func testThirdPartyDiscovery(t *testing.T, version string) {
_, etcdserver, server, assert := initThirdParty(t, version)
// TODO: Uncomment when fix #19254
// defer server.Close()
defer server.Close()
defer etcdserver.Terminate(t)
resp, err := http.Get(server.URL + "/apis/company.com/")