Merge pull request #61402 from lcfang/test0319

Automatic merge from submit-queue (batch tested with PRs 61402, 61143, 61427, 60592). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. delete some unused code **What this PR does / why we need it**: delete some unused code **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #61402 from lcfang/test0319
66ecee9c · Kubernetes Submit Queue · GitHub · 2f4d6b86 · a3c1dfba · 66ecee9c
Unverified Commit 66ecee9c authored Mar 27, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 27, 2018
Showing with 2 additions and 6 deletions

nodes_util.go test/e2e/framework/nodes_util.go +1 -2

resize_nodes.go test/e2e/lifecycle/resize_nodes.go +0 -2

persistent_volumes-local.go test/e2e/storage/persistent_volumes-local.go +1 -2

No files found.
--- 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 {

--- 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 {

--- 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