diff --git a/test/e2e/framework/exec_util.go b/test/e2e/framework/exec_util.go index 29db39bef07..e10c8586d5e 100644 --- a/test/e2e/framework/exec_util.go +++ b/test/e2e/framework/exec_util.go @@ -33,12 +33,10 @@ import ( // ExecOptions passed to ExecWithOptions type ExecOptions struct { - Command []string - + Command []string Namespace string PodName string ContainerName string - Stdin io.Reader CaptureStdout bool CaptureStderr bool @@ -85,11 +83,10 @@ func (f *Framework) ExecWithOptions(options ExecOptions) (string, string, error) // specified container and return stdout, stderr and error func (f *Framework) ExecCommandInContainerWithFullOutput(podName, containerName string, cmd ...string) (string, string, error) { return f.ExecWithOptions(ExecOptions{ - Command: cmd, - Namespace: f.Namespace.Name, - PodName: podName, - ContainerName: containerName, - + Command: cmd, + Namespace: f.Namespace.Name, + PodName: podName, + ContainerName: containerName, Stdin: nil, CaptureStdout: true, CaptureStderr: true, @@ -114,14 +111,14 @@ func (f *Framework) ExecShellInContainer(podName, containerName string, cmd stri func (f *Framework) execCommandInPod(podName string, cmd ...string) string { pod, err := f.PodClient().Get(podName, metav1.GetOptions{}) - ExpectNoError(err, "failed to get pod") + ExpectNoError(err, "failed to get pod %v", podName) gomega.Expect(pod.Spec.Containers).NotTo(gomega.BeEmpty()) return f.ExecCommandInContainer(podName, pod.Spec.Containers[0].Name, cmd...) } func (f *Framework) execCommandInPodWithFullOutput(podName string, cmd ...string) (string, string, error) { pod, err := f.PodClient().Get(podName, metav1.GetOptions{}) - ExpectNoError(err, "failed to get pod") + ExpectNoError(err, "failed to get pod %v", podName) gomega.Expect(pod.Spec.Containers).NotTo(gomega.BeEmpty()) return f.ExecCommandInContainerWithFullOutput(podName, pod.Spec.Containers[0].Name, cmd...) } @@ -131,7 +128,7 @@ func (f *Framework) ExecShellInPod(podName string, cmd string) string { return f.execCommandInPod(podName, "/bin/sh", "-c", cmd) } -// ExecShellInPodWithFullOutput executes the specified command on the pod with returing return stdout, stderr and error. +// ExecShellInPodWithFullOutput executes the specified command on the Pod and returns stdout, stderr and error. func (f *Framework) ExecShellInPodWithFullOutput(podName string, cmd string) (string, string, error) { return f.execCommandInPodWithFullOutput(podName, "/bin/sh", "-c", cmd) }