Skip to content

Commit 66ecee9

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#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 ```
2 parents 2f4d6b8 + a3c1dfb commit 66ecee9

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

test/e2e/framework/nodes_util.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,7 @@ func CheckNodesReady(c clientset.Interface, nt time.Duration, expect int) ([]str
317317
go func() { result <- WaitForNodeToBeReady(c, n, timeout) }()
318318
}
319319
failed := false
320-
// TODO(mbforbes): Change to `for range` syntax once we support only Go
321-
// >= 1.4.
320+
322321
for i := range nodeList.Items {
323322
_ = i
324323
if !<-result {

test/e2e/lifecycle/resize_nodes.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ import (
3030
. "github.com/onsi/gomega"
3131
)
3232

33-
const resizeNodeReadyTimeout = 2 * time.Minute
34-
3533
func resizeRC(c clientset.Interface, ns, name string, replicas int32) error {
3634
rc, err := c.CoreV1().ReplicationControllers(ns).Get(name, metav1.GetOptions{})
3735
if err != nil {

test/e2e/storage/persistent_volumes-local.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ type localTestVolume struct {
103103

104104
const (
105105
// TODO: This may not be available/writable on all images.
106-
hostBase = "/tmp"
107-
containerBase = "/myvol"
106+
hostBase = "/tmp"
108107
// Path to the first volume in the test containers
109108
// created via createLocalPod or makeLocalPod
110109
// leveraging pv_util.MakePod

0 commit comments

Comments
 (0)