Skip to content

K
k3s
Commit 6873bccf authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

e2e: wait for deployments before getting logs

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent b5d97fb2
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
tests/e2e/startup/startup_test.go
View file @ 6873bccf
...@@ -127,6 +127,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() { ...@@ -127,6 +127,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
Eventually(func() error { Eventually(func() error {
return tests.AllPodsUp(tc.KubeConfigFile) return tests.AllPodsUp(tc.KubeConfigFile)
}, "360s", "5s").Should(Succeed()) }, "360s", "5s").Should(Succeed())
Eventually(func() error {
return tests.CheckDeployments([]string{"coredns", "local-path-provisioner", "metrics-server"}, tc.KubeConfigFile)
}, "300s", "10s").Should(Succeed())
e2e.DumpPods(tc.KubeConfigFile) e2e.DumpPods(tc.KubeConfigFile)
}) })
...@@ -187,6 +190,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() { ...@@ -187,6 +190,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
Eventually(func() error { Eventually(func() error {
return tests.AllPodsUp(tc.KubeConfigFile) return tests.AllPodsUp(tc.KubeConfigFile)
}, "360s", "5s").Should(Succeed()) }, "360s", "5s").Should(Succeed())
Eventually(func() error {
return tests.CheckDefaultDeployments(tc.KubeConfigFile)
}, "300s", "10s").Should(Succeed())
e2e.DumpPods(tc.KubeConfigFile) e2e.DumpPods(tc.KubeConfigFile)
}) })
It("Kills the cluster", func() { It("Kills the cluster", func() {
...@@ -220,6 +226,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() { ...@@ -220,6 +226,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
Eventually(func() error { Eventually(func() error {
return tests.AllPodsUp(tc.KubeConfigFile) return tests.AllPodsUp(tc.KubeConfigFile)
}, "360s", "5s").Should(Succeed()) }, "360s", "5s").Should(Succeed())
Eventually(func() error {
return tests.CheckDefaultDeployments(tc.KubeConfigFile)
}, "300s", "10s").Should(Succeed())
e2e.DumpPods(tc.KubeConfigFile) e2e.DumpPods(tc.KubeConfigFile)
}) })
It("Kills the cluster", func() { It("Kills the cluster", func() {
...@@ -253,6 +262,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() { ...@@ -253,6 +262,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
Eventually(func() error { Eventually(func() error {
return tests.AllPodsUp(tc.KubeConfigFile) return tests.AllPodsUp(tc.KubeConfigFile)
}, "360s", "5s").Should(Succeed()) }, "360s", "5s").Should(Succeed())
Eventually(func() error {
return tests.CheckDefaultDeployments(tc.KubeConfigFile)
}, "300s", "10s").Should(Succeed())
e2e.DumpPods(tc.KubeConfigFile) e2e.DumpPods(tc.KubeConfigFile)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment