github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance test api to support test cases involved multiple containers

Browse Source
This commit is contained in:
He Simei
2015-06-23 16:03:31 +08:00
parent ebeb104493
commit 912e54789e
9 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/docker_containers.go
View File

@@ -45,7 +45,7 @@ var _ = Describe("Docker Containers", func() {
})
It("should use the image defaults if command and args are blank", func() {
testContainerOutputInNamespace("use defaults", c, entrypointTestPod(), []string{
testContainerOutputInNamespace("use defaults", c, entrypointTestPod(), 0, []string{
"[/ep default arguments]",
}, ns)
})
@@ -54,7 +54,7 @@ var _ = Describe("Docker Containers", func() {
pod := entrypointTestPod()
pod.Spec.Containers[0].Args = []string{"override", "arguments"}
testContainerOutputInNamespace("override arguments", c, pod, []string{
testContainerOutputInNamespace("override arguments", c, pod, 0, []string{
"[/ep override arguments]",
}, ns)
})
@@ -65,7 +65,7 @@ var _ = Describe("Docker Containers", func() {
pod := entrypointTestPod()
pod.Spec.Containers[0].Command = []string{"/ep-2"}
testContainerOutputInNamespace("override command", c, pod, []string{
testContainerOutputInNamespace("override command", c, pod, 0, []string{
"[/ep-2]",
}, ns)
})
@@ -75,7 +75,7 @@ var _ = Describe("Docker Containers", func() {
pod.Spec.Containers[0].Command = []string{"/ep-2"}
pod.Spec.Containers[0].Args = []string{"override", "arguments"}
testContainerOutputInNamespace("override all", c, pod, []string{
testContainerOutputInNamespace("override all", c, pod, 0, []string{
"[/ep-2 override arguments]",
}, ns)
})