Merge pull request #64613 from HotelsDotCom/bug/failing-tests

Automatic merge from submit-queue. 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>. Subpath env expansion alpha tests failing **What this PR does / why we need it**: The alpha tests which wait for events do not get events back in the wait time Increased timeout to set to the framework default **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 #64578 **Special notes for your reviewer**: @kubernetes/sig-storage-bugs /cc @msau42 **Release note**: ```release-note NONE ```

Merge pull request #64613 from HotelsDotCom/bug/failing-tests
a19062a6 · Kubernetes Submit Queue · GitHub · 0757e05e · fbd10d0f · a19062a6
Unverified Commit a19062a6 authored Jun 02, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

expansion.go test/e2e/common/expansion.go +1 -2

No files found.
--- a/test/e2e/common/expansion.go
+++ b/test/e2e/common/expansion.go
@@ -25,7 +25,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"time"
 )
 // These tests exercise the Kubernetes expansion syntax $(VAR).
@@ -318,7 +317,7 @@ func testPodFailSubpath(f *framework.Framework, pod *v1.Pod, errorText string) {
 		framework.DeletePodWithWait(f, f.ClientSet, pod)
 	}()
-	err = framework.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, 30*time.Second)
+	err = framework.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
 	Expect(err).To(HaveOccurred(), "while waiting for pod to be running")
 	selector := fields.Set{