github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16008 from ixdy/e2e

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-21 05:45:32 -07:00
commit e9dc7306cc
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/daemon_restart.go
View File

@ -246,9 +246,9 @@ var _ = Describe("DaemonRestart", func() {
}) })
AfterEach(func() { AfterEach(func() {
defer framework.afterEach()
close(stopCh) close(stopCh)
expectNoError(DeleteRC(framework.Client, ns, rcName)) expectNoError(DeleteRC(framework.Client, ns, rcName))
framework.afterEach()
}) })
It("Controller Manager should not create/delete replicas across restart", func() { It("Controller Manager should not create/delete replicas across restart", func() {

2
test/e2e/daemon_set.go
View File

@ -65,9 +65,9 @@ var _ = Describe("Daemon set", func() {
}) })
AfterEach(func() { AfterEach(func() {
defer f.afterEach()
err := clearDaemonSetNodeLabels(f.Client) err := clearDaemonSetNodeLabels(f.Client)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
f.afterEach()
}) })
It("should run and stop simple daemon", func() { It("should run and stop simple daemon", func() {

1
test/e2e/latency.go
View File

@ -80,6 +80,7 @@ var _ = Describe("[Performance Suite] Latency", func() {
}) })
AfterEach(func() { AfterEach(func() {
defer framework.afterEach()
By("Removing additional pods if any") By("Removing additional pods if any")
for i := 1; i <= nodeCount; i++ { for i := 1; i <= nodeCount; i++ {
name := additionalPodsPrefix + "-" + strconv.Itoa(i) name := additionalPodsPrefix + "-" + strconv.Itoa(i)

2
test/e2e/scheduler_predicates.go
View File

@ -176,13 +176,13 @@ var _ = Describe("SchedulerPredicates", func() {
}) })
AfterEach(func() { AfterEach(func() {
defer framework.afterEach()
rc, err := c.ReplicationControllers(ns).Get(RCName) rc, err := c.ReplicationControllers(ns).Get(RCName)
if err == nil && rc.Spec.Replicas != 0 { if err == nil && rc.Spec.Replicas != 0 {
By("Cleaning up the replication controller") By("Cleaning up the replication controller")
err := DeleteRC(c, ns, RCName) err := DeleteRC(c, ns, RCName)
expectNoError(err) expectNoError(err)
} }
framework.afterEach()
}) })
// This test verifies that max-pods flag works as advertised. It assumes that cluster add-on pods stay stable // This test verifies that max-pods flag works as advertised. It assumes that cluster add-on pods stay stable