github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #17678 from gmarek/fix-jenkins 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-11-23 17:16:37 -08:00
parent aa534a5b5f 0beaea0af7
commit 315b9000e2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/resize_nodes.go
View File

@ -388,12 +388,16 @@ func performTemporaryNetworkFailure(c *client.Client, ns, rcName string, replica
var _ = Describe("Nodes", func() { var _ = Describe("Nodes", func() {
framework := NewFramework("resize-nodes") framework := NewFramework("resize-nodes")
var systemPodsNo int
var c *client.Client var c *client.Client
var ns string var ns string
BeforeEach(func() { BeforeEach(func() {
c = framework.Client c = framework.Client
ns = framework.Namespace.Name ns = framework.Namespace.Name
systemPods, err := c.Pods(api.NamespaceSystem).List(labels.Everything(), fields.Everything())
Expect(err).NotTo(HaveOccurred())
systemPodsNo = len(systemPods.Items)
}) })
Describe("Resize", func() { Describe("Resize", func() {
@ -424,10 +428,8 @@ var _ = Describe("Nodes", func() {
// Many e2e tests assume that the cluster is fully healthy before they start. Wait until // Many e2e tests assume that the cluster is fully healthy before they start. Wait until
// the cluster is restored to health. // the cluster is restored to health.
By("waiting for system pods to successfully restart") By("waiting for system pods to successfully restart")
pods, err := framework.Client.Pods(api.NamespaceSystem).List(labels.Everything(), fields.Everything())
Expect(err).NotTo(HaveOccurred())
err = waitForPodsRunningReady(api.NamespaceSystem, len(pods.Items), podReadyBeforeTimeout) err := waitForPodsRunningReady(api.NamespaceSystem, systemPodsNo, podReadyBeforeTimeout)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })