Skip to content

K
k3s
Commit c92f94aa authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45634 from zjj2wry/e2e-l

Automatic merge from submit-queue (batch tested with PRs 45634, 45480) Fix BY() format **What this PR does / why we need it**: i read other by(), just format, think you **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```
parents 947db16d a3a61946
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
test/e2e/portforward.go
View file @ c92f94aa
...@@ -206,7 +206,7 @@ func runPortForward(ns, podName string, port int) *portForwardCommand { ...@@ -206,7 +206,7 @@ func runPortForward(ns, podName string, port int) *portForwardCommand {
} }
func doTestConnectSendDisconnect(bindAddress string, f *framework.Framework) { func doTestConnectSendDisconnect(bindAddress string, f *framework.Framework) {
By("creating the target pod") By("Creating the target pod")
pod := pfPod("", "10", "10", "100", fmt.Sprintf("%s", bindAddress)) pod := pfPod("", "10", "10", "100", fmt.Sprintf("%s", bindAddress))
if _, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod); err != nil { if _, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod); err != nil {
framework.Failf("Couldn't create pod: %v", err) framework.Failf("Couldn't create pod: %v", err)
...@@ -262,7 +262,7 @@ func doTestConnectSendDisconnect(bindAddress string, f *framework.Framework) { ...@@ -262,7 +262,7 @@ func doTestConnectSendDisconnect(bindAddress string, f *framework.Framework) {
} }
func doTestMustConnectSendNothing(bindAddress string, f *framework.Framework) { func doTestMustConnectSendNothing(bindAddress string, f *framework.Framework) {
By("creating the target pod") By("Creating the target pod")
pod := pfPod("abc", "1", "1", "1", fmt.Sprintf("%s", bindAddress)) pod := pfPod("abc", "1", "1", "1", fmt.Sprintf("%s", bindAddress))
if _, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod); err != nil { if _, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod); err != nil {
framework.Failf("Couldn't create pod: %v", err) framework.Failf("Couldn't create pod: %v", err)
...@@ -307,7 +307,7 @@ func doTestMustConnectSendNothing(bindAddress string, f *framework.Framework) { ...@@ -307,7 +307,7 @@ func doTestMustConnectSendNothing(bindAddress string, f *framework.Framework) {
} }
func doTestMustConnectSendDisconnect(bindAddress string, f *framework.Framework) { func doTestMustConnectSendDisconnect(bindAddress string, f *framework.Framework) {
By("creating the target pod") By("Creating the target pod")
pod := pfPod("abc", "10", "10", "100", fmt.Sprintf("%s", bindAddress)) pod := pfPod("abc", "10", "10", "100", fmt.Sprintf("%s", bindAddress))
if _, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod); err != nil { if _, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod); err != nil {
framework.Failf("Couldn't create pod: %v", err) framework.Failf("Couldn't create pod: %v", err)
...@@ -377,7 +377,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) { ...@@ -377,7 +377,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) {
config, err := framework.LoadConfig() config, err := framework.LoadConfig()
Expect(err).NotTo(HaveOccurred(), "unable to get base config") Expect(err).NotTo(HaveOccurred(), "unable to get base config")
By("creating the pod") By("Creating the pod")
pod := pfPod("def", "10", "10", "100", fmt.Sprintf("%s", bindAddress)) pod := pfPod("def", "10", "10", "100", fmt.Sprintf("%s", bindAddress))
if _, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod); err != nil { if _, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod); err != nil {
framework.Failf("Couldn't create pod: %v", err) framework.Failf("Couldn't create pod: %v", err)
...@@ -436,13 +436,13 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) { ...@@ -436,13 +436,13 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) {
return nil return nil
}, time.Minute, 10*time.Second).Should(BeNil()) }, time.Minute, 10*time.Second).Should(BeNil())
By("sending the expected data to the local port") By("Sending the expected data to the local port")
err = wsWrite(ws, 0, []byte("def")) err = wsWrite(ws, 0, []byte("def"))
if err != nil { if err != nil {
framework.Failf("Failed to write to websocket %s: %v", url.String(), err) framework.Failf("Failed to write to websocket %s: %v", url.String(), err)
} }
By("reading data from the local port") By("Reading data from the local port")
buf := bytes.Buffer{} buf := bytes.Buffer{}
expectedData := bytes.Repeat([]byte("x"), 100) expectedData := bytes.Repeat([]byte("x"), 100)
Eventually(func() error { Eventually(func() error {
...@@ -460,7 +460,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) { ...@@ -460,7 +460,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) {
return nil return nil
}, time.Minute, 10*time.Second).Should(BeNil()) }, time.Minute, 10*time.Second).Should(BeNil())
By("verifying logs") By("Verifying logs")
logOutput, err := framework.GetPodLogs(f.ClientSet, f.Namespace.Name, pod.Name, "portforwardtester") logOutput, err := framework.GetPodLogs(f.ClientSet, f.Namespace.Name, pod.Name, "portforwardtester")
if err != nil { if err != nil {
framework.Failf("Error retrieving pod logs: %v", err) framework.Failf("Error retrieving pod logs: %v", err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment