github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Deflake port-forward e2e test

Browse Source 
We should read and verify the data before actually closing the
connection to avoid connection based-races within the test.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
Sascha Grunert 2020-05-13 08:53:28 +02:00
parent 70948498bc
commit c7648f5984
No known key found for this signature in database
GPG Key ID: 8CE029DD1A866E52
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/kubectl/portforward.go
View File

@ -322,11 +322,6 @@ func doTestMustConnectSendDisconnect(bindAddress string, f *framework.Framework)
ginkgo.By("Sending the expected data to the local port")
fmt.Fprint(conn, "abc")
ginkgo.By("Closing the write half of the client's connection")
if err = conn.CloseWrite(); err != nil {
framework.Failf("Couldn't close the write half of the client's connection: %v", err)
}
ginkgo.By("Reading data from the local port")
fromServer, err := ioutil.ReadAll(conn)
if err != nil {
@ -343,6 +338,11 @@ func doTestMustConnectSendDisconnect(bindAddress string, f *framework.Framework)
framework.Failf("Expected %q from server, got %q", e, a)
}
ginkgo.By("Closing the write half of the client's connection")
if err = conn.CloseWrite(); err != nil {
framework.Failf("Couldn't close the write half of the client's connection: %v", err)
}
ginkgo.By("Waiting for the target pod to stop running")
if err := WaitForTerminatedContainer(f, pod, "portforwardtester"); err != nil {
framework.Failf("Container did not terminate: %v", err)