github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17161 from soltysh/strip_reaper

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-17 05:45:35 -08:00
parent 71b8b352cc 64f778804d
commit 7ad8bb1787
7 changed files with 41 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/daemon_set.go
View File

@@ -100,7 +100,7 @@ var _ = Describe("Daemon set", func() {
Logf("Check that reaper kills all daemon pods for %s", dsName)
dsReaper, err := kubectl.ReaperFor("DaemonSet", c)
Expect(err).NotTo(HaveOccurred())
_, err = dsReaper.Stop(ns, dsName, 0, nil)
err = dsReaper.Stop(ns, dsName, 0, nil)
Expect(err).NotTo(HaveOccurred())
err = wait.Poll(dsRetryPeriod, dsRetryTimeout, checkRunningOnNoNodes(f, label))
Expect(err).NotTo(HaveOccurred(), "error waiting for daemon pod to be reaped")