From 463d21f352118166848e74277a1876517e46683b Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 15 Feb 2016 12:53:02 +0100 Subject: [PATCH] Comment out calls to httptest.Server.Close() --- test/integration/client_test.go | 9 ++++++--- test/integration/master_test.go | 9 ++++++--- test/integration/metrics_test.go | 6 ++++-- test/integration/persistent_volumes_test.go | 3 ++- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/test/integration/client_test.go b/test/integration/client_test.go index a8f4194031d..7c67581783c 100644 --- 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 index 9e74782ce69..91d9685e69c 100644 --- 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 index 57f8aa826f7..57bc1350f90 100644 --- 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 index 66eae7e1e46..4f81bb56988 100644 --- 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