From a3c1dfba245ebc012c5c421e57c09de71480cba1 Mon Sep 17 00:00:00 2001 From: lcfang Date: Tue, 20 Mar 2018 19:58:19 +0800 Subject: [PATCH] delete some unused code --- test/e2e/framework/nodes_util.go | 3 +-- test/e2e/lifecycle/resize_nodes.go | 2 -- test/e2e/storage/persistent_volumes-local.go | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index 5916d9d4bc4..7185da71ef6 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -317,8 +317,7 @@ func CheckNodesReady(c clientset.Interface, nt time.Duration, expect int) ([]str go func() { result <- WaitForNodeToBeReady(c, n, timeout) }() } failed := false - // TODO(mbforbes): Change to `for range` syntax once we support only Go - // >= 1.4. + for i := range nodeList.Items { _ = i if !<-result { diff --git a/test/e2e/lifecycle/resize_nodes.go b/test/e2e/lifecycle/resize_nodes.go index 49e87455993..bbbf6c6ed89 100644 --- a/test/e2e/lifecycle/resize_nodes.go +++ b/test/e2e/lifecycle/resize_nodes.go @@ -30,8 +30,6 @@ import ( . "github.com/onsi/gomega" ) -const resizeNodeReadyTimeout = 2 * time.Minute - func resizeRC(c clientset.Interface, ns, name string, replicas int32) error { rc, err := c.CoreV1().ReplicationControllers(ns).Get(name, metav1.GetOptions{}) if err != nil { diff --git a/test/e2e/storage/persistent_volumes-local.go b/test/e2e/storage/persistent_volumes-local.go index 83899f685d8..5d21a499c71 100644 --- a/test/e2e/storage/persistent_volumes-local.go +++ b/test/e2e/storage/persistent_volumes-local.go @@ -103,8 +103,7 @@ type localTestVolume struct { const ( // TODO: This may not be available/writable on all images. - hostBase = "/tmp" - containerBase = "/myvol" + hostBase = "/tmp" // Path to the first volume in the test containers // created via createLocalPod or makeLocalPod // leveraging pv_util.MakePod