github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14440 from brendandburns/flakes2

Browse Source 
Increase some more timeouts to eliminate flakes
This commit is contained in:
Jerzy Szczepkowski 2015-09-24 10:23:34 +02:00
commit c53df247c8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/scheduler_test.go
View File

@ -37,6 +37,7 @@ import (
"k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/record"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/admit"
"k8s.io/kubernetes/plugin/pkg/scheduler" "k8s.io/kubernetes/plugin/pkg/scheduler"
@ -253,7 +254,7 @@ func DoTestUnschedulableNodes(t *testing.T, restClient *client.Client, nodeStore
} }
// There are no schedulable nodes - the pod shouldn't be scheduled. // There are no schedulable nodes - the pod shouldn't be scheduled.
err = wait.Poll(time.Second, time.Second*10, podScheduled(restClient, myPod.Namespace, myPod.Name)) err = wait.Poll(time.Second, util.ForeverTestTimeout, podScheduled(restClient, myPod.Namespace, myPod.Name))
if err == nil { if err == nil {
t.Errorf("Pod scheduled successfully on unschedulable nodes") t.Errorf("Pod scheduled successfully on unschedulable nodes")
} }
@ -271,7 +272,7 @@ func DoTestUnschedulableNodes(t *testing.T, restClient *client.Client, nodeStore
mod.makeSchedulable(t, schedNode, nodeStore, restClient) mod.makeSchedulable(t, schedNode, nodeStore, restClient)
// Wait until the pod is scheduled. // Wait until the pod is scheduled.
err = wait.Poll(time.Second, time.Second*10, podScheduled(restClient, myPod.Namespace, myPod.Name)) err = wait.Poll(time.Second, util.ForeverTestTimeout, podScheduled(restClient, myPod.Namespace, myPod.Name))
if err != nil { if err != nil {
t.Errorf("Test %d: failed to schedule a pod: %v", i, err) t.Errorf("Test %d: failed to schedule a pod: %v", i, err)
} else { } else {