Comment out calls to httptest.Server.Close()

iiq374 · Feb 15, 2016 · 463d21f · 463d21f
1 parent 48caef3
commit 463d21f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/test/integration/client_test.go b/test/integration/client_test.go
@@ -39,7 +39,8 @@ import (
 
 func TestClient(t *testing.T) {
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	ns := api.NamespaceDefault
 	framework.DeleteAllEtcdKeys()
@@ -109,7 +110,8 @@ func TestClient(t *testing.T) {
 
 func TestSingleWatch(t *testing.T) {
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	ns := "blargh"
 	deleteAllEtcdKeys()
@@ -194,7 +196,8 @@ func TestMultiWatch(t *testing.T) {
 	framework.DeleteAllEtcdKeys()
 	defer framework.DeleteAllEtcdKeys()
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	ns := api.NamespaceDefault
 	client := client.NewOrDie(&client.Config{Host: s.URL, ContentConfig: client.ContentConfig{GroupVersion: testapi.Default.GroupVersion()}})

diff --git a/test/integration/master_test.go b/test/integration/master_test.go
@@ -31,7 +31,8 @@ import (
 
 func TestExperimentalPrefix(t *testing.T) {
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	resp, err := http.Get(s.URL + "/apis/extensions/")
 	if err != nil {
@@ -44,7 +45,8 @@ func TestExperimentalPrefix(t *testing.T) {
 
 func TestWatchSucceedsWithoutArgs(t *testing.T) {
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	resp, err := http.Get(s.URL + "/api/v1/namespaces?watch=1")
 	if err != nil {
@@ -58,7 +60,8 @@ func TestWatchSucceedsWithoutArgs(t *testing.T) {
 
 func TestAccept(t *testing.T) {
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	resp, err := http.Get(s.URL + "/api/")
 	if err != nil {

diff --git a/test/integration/metrics_test.go b/test/integration/metrics_test.go
@@ -86,7 +86,8 @@ func checkForExpectedMetrics(t *testing.T, metrics []*prometheuspb.MetricFamily,
 
 func TestMasterProcessMetrics(t *testing.T) {
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	metrics, err := scrapeMetrics(s)
 	if err != nil {
@@ -103,7 +104,8 @@ func TestMasterProcessMetrics(t *testing.T) {
 
 func TestApiserverMetrics(t *testing.T) {
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	// Make a request to the apiserver to ensure there's at least one data point
 	// for the metrics we're expecting -- otherwise, they won't be exported.

diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go
@@ -43,7 +43,8 @@ func init() {
 
 func TestPersistentVolumeRecycler(t *testing.T) {
 	_, s := framework.RunAMaster(t)
-	defer s.Close()
+	// TODO: Uncomment when fix #19254
+	// defer s.Close()
 
 	deleteAllEtcdKeys()
 	// Use higher QPS and Burst, there is a test for race condition below, which