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

Merge pull request #13107 from liggitt/port_forward_test_flake

Browse Source 
Fix portforward test flake with GOMAXPROCS > 1
This commit is contained in:
Nikhil Jindal 2015-08-24 15:56:22 -07:00
commit 50de168130
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/client/unversioned/portforward/portforward_test.go
View File

@ -178,6 +178,8 @@ func (s *fakeUpgradeStream) Read(p []byte) (int, error) {
s.readCalled = true
b := []byte(s.data)
n := copy(p, b)
// Indicate we returned all the data, and have no more data (EOF)
// Returning an EOF here will cause the port forwarder to immediately terminate, which is correct when we have no more data to send
return n, io.EOF
}
@ -185,9 +187,10 @@ func (s *fakeUpgradeStream) Write(p []byte) (int, error) {
s.lock.Lock()
defer s.lock.Unlock()
s.writeCalled = true
s.dataWritten = make([]byte, len(p))
copy(s.dataWritten, p)
return len(p), io.EOF
s.dataWritten = append(s.dataWritten, p...)
// Indicate the stream accepted all the data, and can accept more (no err)
// Returning an EOF here will cause the port forwarder to immediately terminate, which is incorrect, in case someone writes more data
return len(p), nil
}
func (s *fakeUpgradeStream) Close() error {