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

refactor and clean up e2e/framework/exec_util.go

Browse Source
This commit is contained in:
SataQiu
2019-04-09 16:00:29 +08:00
parent 1cca3f9d45
commit 55b322e04a
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/framework/exec_util.go
View File

@@ -34,11 +34,9 @@ import (
// ExecOptions passed to ExecWithOptions // ExecOptions passed to ExecWithOptions
type ExecOptions struct { type ExecOptions struct {
Command []string Command []string
Namespace string Namespace string
PodName string PodName string
ContainerName string ContainerName string
Stdin io.Reader Stdin io.Reader
CaptureStdout bool CaptureStdout bool
CaptureStderr bool CaptureStderr bool
@@ -89,7 +87,6 @@ func (f *Framework) ExecCommandInContainerWithFullOutput(podName, containerName
Namespace: f.Namespace.Name, Namespace: f.Namespace.Name,
PodName: podName, PodName: podName,
ContainerName: containerName, ContainerName: containerName,
Stdin: nil, Stdin: nil,
CaptureStdout: true, CaptureStdout: true,
CaptureStderr: 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 { func (f *Framework) execCommandInPod(podName string, cmd ...string) string {
pod, err := f.PodClient().Get(podName, metav1.GetOptions{}) 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()) gomega.Expect(pod.Spec.Containers).NotTo(gomega.BeEmpty())
return f.ExecCommandInContainer(podName, pod.Spec.Containers[0].Name, cmd...) return f.ExecCommandInContainer(podName, pod.Spec.Containers[0].Name, cmd...)
} }
func (f *Framework) execCommandInPodWithFullOutput(podName string, cmd ...string) (string, string, error) { func (f *Framework) execCommandInPodWithFullOutput(podName string, cmd ...string) (string, string, error) {
pod, err := f.PodClient().Get(podName, metav1.GetOptions{}) 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()) gomega.Expect(pod.Spec.Containers).NotTo(gomega.BeEmpty())
return f.ExecCommandInContainerWithFullOutput(podName, pod.Spec.Containers[0].Name, cmd...) 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) 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) { func (f *Framework) ExecShellInPodWithFullOutput(podName string, cmd string) (string, string, error) {
return f.execCommandInPodWithFullOutput(podName, "/bin/sh", "-c", cmd) return f.execCommandInPodWithFullOutput(podName, "/bin/sh", "-c", cmd)
} }