github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43421 from bizhao/master

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 43429, 43416, 43312, 43141, 43421)

Make e2e-dns test more stable by increasing wait time

**What this PR does / why we need it**:
In many cases, 60 seconds are not enough for generating all dns results.
Since the probeCmd takes up to 600 seconds, use 600 here too.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: 
fixes #43264, #43094, #43100 

**Special notes for your reviewer**:

**Release note**:

NONE
This commit is contained in:
Kubernetes Submit Queue
2017-03-25 22:24:28 -07:00
committed by GitHub
parent 484ac692f8 3b98c80891
commit 33012c03e0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/dns.go
View File

@@ -179,7 +179,7 @@ func assertFilesExist(fileNames []string, fileDir string, pod *v1.Pod, client cl
func assertFilesContain(fileNames []string, fileDir string, pod *v1.Pod, client clientset.Interface, check bool, expected string) { func assertFilesContain(fileNames []string, fileDir string, pod *v1.Pod, client clientset.Interface, check bool, expected string) {
var failed []string var failed []string
framework.ExpectNoError(wait.Poll(time.Second*2, time.Second*60, func() (bool, error) { framework.ExpectNoError(wait.Poll(time.Second*10, time.Second*600, func() (bool, error) {
failed = []string{} failed = []string{}
subResourceProxyAvailable, err := framework.ServerVersionGTE(framework.SubResourcePodProxyVersion, client.Discovery()) subResourceProxyAvailable, err := framework.ServerVersionGTE(framework.SubResourcePodProxyVersion, client.Discovery())
if err != nil { if err != nil {