github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40529 from lucab/to-k8s/e2e_node-kubelet-busybox-argv0

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40529, 40630)

test/e2e_node: tie together expected string and exec

This commit ties together busybox-sh invocation and test expectation
to avoid subtle mismatches between exec command and output string.
This commit is contained in:
Kubernetes Submit Queue 2017-02-01 00:16:37 -08:00 committed by GitHub
commit f272781259
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/kubelet_test.go
View File

@ -131,7 +131,7 @@ var _ = framework.KubeDescribe("Kubelet", func() {
{ {
Image: "gcr.io/google_containers/busybox:1.24", Image: "gcr.io/google_containers/busybox:1.24",
Name: podName, Name: podName,
Command: []string{"sh", "-c", "echo test > /file; sleep 240"}, Command: []string{"/bin/sh", "-c", "echo test > /file; sleep 240"},
SecurityContext: &v1.SecurityContext{ SecurityContext: &v1.SecurityContext{
ReadOnlyRootFilesystem: &isReadOnly, ReadOnlyRootFilesystem: &isReadOnly,
}, },
@ -148,7 +148,7 @@ var _ = framework.KubeDescribe("Kubelet", func() {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
buf.ReadFrom(rc) buf.ReadFrom(rc)
return buf.String() return buf.String()
}, time.Minute, time.Second*4).Should(Equal("sh: can't create /file: Read-only file system\n")) }, time.Minute, time.Second*4).Should(Equal("/bin/sh: can't create /file: Read-only file system\n"))
}) })
}) })
}) })