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

Merge pull request #18636 from feihujiang/removeStopCommandInE2eTest

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-16 23:38:11 -08:00
commit 5f1ebc3420
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/kubectl.go
View File

@ -775,7 +775,7 @@ var _ = Describe("Kubectl client", func() {
}) })
AfterEach(func() { AfterEach(func() {
runKubectlOrDie("stop", "rc", rcName, nsFlag) runKubectlOrDie("delete", "rc", rcName, nsFlag)
}) })
It("should create an rc from an image [Conformance]", func() { It("should create an rc from an image [Conformance]", func() {
@ -818,7 +818,7 @@ var _ = Describe("Kubectl client", func() {
}) })
AfterEach(func() { AfterEach(func() {
runKubectlOrDie("stop", "jobs", jobName, nsFlag) runKubectlOrDie("delete", "jobs", jobName, nsFlag)
}) })
It("should create a job from an image when restart is OnFailure [Conformance]", func() { It("should create a job from an image when restart is OnFailure [Conformance]", func() {

2
test/e2e/util.go
View File

@ -1019,7 +1019,7 @@ func cleanup(filePath string, ns string, selectors ...string) {
if ns != "" { if ns != "" {
nsArg = fmt.Sprintf("--namespace=%s", ns) nsArg = fmt.Sprintf("--namespace=%s", ns)
} }
runKubectlOrDie("stop", "--grace-period=0", "-f", filePath, nsArg) runKubectlOrDie("delete", "--grace-period=0", "-f", filePath, nsArg)
for _, selector := range selectors { for _, selector := range selectors {
resources := runKubectlOrDie("get", "rc,svc", "-l", selector, "--no-headers", nsArg) resources := runKubectlOrDie("get", "rc,svc", "-l", selector, "--no-headers", nsArg)