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

Merge pull request #22958 from jlowdermilk/run-test 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-14 18:10:26 -07:00
parent bf1bb5d309 c732681354
commit a9c17c1fbe
1 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/e2e/kubectl.go
View File

@ -861,6 +861,48 @@ var _ = Describe("Kubectl client", func() {
})
})
Describe("Kubectl run default", func() {
var nsFlag string
var name string
var cleanUp func()
BeforeEach(func() {
nsFlag = fmt.Sprintf("--namespace=%v", ns)
gte, err := serverVersionGTE(deploymentsVersion, c)
if err != nil {
Failf("Failed to get server version: %v", err)
}
if gte {
name = "e2e-test-nginx-deployment"
cleanUp = func() { runKubectlOrDie("delete", "deployment", name, nsFlag) }
} else {
name = "e2e-test-nginx-rc"
cleanUp = func() { runKubectlOrDie("delete", "rc", name, nsFlag) }
}
})
AfterEach(func() {
cleanUp()
})
It("should create an rc or deployment from an image [Conformance]", func() {
By("running the image " + nginxImage)
runKubectlOrDie("run", name, "--image="+nginxImage, nsFlag)
By("verifying the pod controlled by " + name + " gets created")
label := labels.SelectorFromSet(labels.Set(map[string]string{"run": name}))
podlist, err := waitForPodsWithLabel(c, ns, label)
if err != nil {
Failf("Failed getting pod controlled by %s: %v", name, err)
}
pods := podlist.Items
if pods == nil || len(pods) != 1 || len(pods[0].Spec.Containers) != 1 || pods[0].Spec.Containers[0].Image != nginxImage {
runKubectlOrDie("get", "pods", "-L", "run", nsFlag)
Failf("Failed creating 1 pod with expected image %s. Number of pods = %v", nginxImage, len(pods))
}
})
})
Describe("Kubectl run rc", func() {
var nsFlag string
var rcName string
@ -913,7 +955,6 @@ var _ = Describe("Kubectl client", func() {
Failf("Failed getting logs by rc %s: %v", rcName, err)
}
})
})
Describe("Kubectl run deployment", func() {
@ -933,7 +974,7 @@ var _ = Describe("Kubectl client", func() {
SkipUnlessServerVersionGTE(deploymentsVersion, c)
By("running the image " + nginxImage)
runKubectlOrDie("run", dName, "--image="+nginxImage, nsFlag)
runKubectlOrDie("run", dName, "--image="+nginxImage, "--generator=deployment/v1beta1", nsFlag)
By("verifying the deployment " + dName + " was created")
d, err := c.Extensions().Deployments(ns).Get(dName)
if err != nil {
@ -956,7 +997,6 @@ var _ = Describe("Kubectl client", func() {
Failf("Failed creating 1 pod with expected image %s. Number of pods = %v", nginxImage, len(pods))
}
})
})
Describe("Kubectl run job", func() {
@ -1009,7 +1049,6 @@ var _ = Describe("Kubectl client", func() {
Failf("Failed creating a job with correct restart policy for --restart=OnFailure")
}
})
})
Describe("Kubectl run --rm job", func() {