Merge pull request #6636 from ncdc/fix-flakey-portforward-test

Fix flakey port forward test

Merge pull request #6636 from ncdc/fix-flakey-portforward-test
554efa64 · Dawn Chen · c6d4bb37 · c07e98b7 · 554efa64
Commit 554efa64 authored Apr 09, 2015 by Dawn Chen
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

portforward_test.go pkg/client/portforward/portforward_test.go +4 -1

No files found.
--- a/pkg/client/portforward/portforward_test.go
+++ b/pkg/client/portforward/portforward_test.go
@@ -138,7 +138,10 @@ func (c *fakeUpgradeConnection) CreateStream(headers http.Header) (httpstream.St

 	stream := &fakeUpgradeStream{}
 	c.streams[headers.Get(api.PortHeader)] = stream
-	stream.data = c.portData[headers.Get(api.PortHeader)]
+	// only simulate data on the data stream for now, not the error stream
+	if headers.Get(api.StreamType) == api.StreamTypeData {
+		stream.data = c.portData[headers.Get(api.PortHeader)]
+	}

 	return stream, nil
 }