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

Change TestContainerOutput to use the framework pod client.

Browse Source
This commit is contained in:
Random-Liu
2016-07-20 11:03:05 -07:00
parent 472dcec7b2
commit 5c7ac701d3
10 changed files with 72 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/host_path.go
View File

@@ -56,10 +56,9 @@ var _ = framework.KubeDescribe("hostPath", func() {
fmt.Sprintf("--fs_type=%v", volumePath),
fmt.Sprintf("--file_mode=%v", volumePath),
}
framework.TestContainerOutput("hostPath mode", c, pod, 0, []string{
f.TestContainerOutput("hostPath mode", pod, 0, []string{
"mode of file \"/test-volume\": dtrwxrwxrwx", // we expect the sticky bit (mode flag t) to be set for the dir
},
namespace.Name)
})
})
// This test requires mounting a folder into a container with write privileges.
@@ -83,10 +82,9 @@ var _ = framework.KubeDescribe("hostPath", func() {
}
//Read the content of the file with the second container to
//verify volumes being shared properly among containers within the pod.
framework.TestContainerOutput("hostPath r/w", c, pod, 1, []string{
f.TestContainerOutput("hostPath r/w", pod, 1, []string{
"content of file \"/test-volume/test-file\": mount-tester new file",
}, namespace.Name,
)
})
})
It("should support subPath [Conformance]", func() {
@@ -115,9 +113,9 @@ var _ = framework.KubeDescribe("hostPath", func() {
fmt.Sprintf("--retry_time=%d", retryDuration),
}
framework.TestContainerOutput("hostPath subPath", c, pod, 1, []string{
f.TestContainerOutput("hostPath subPath", pod, 1, []string{
"content of file \"" + filePathInReader + "\": mount-tester new file",
}, namespace.Name)
})
})
})