Skip to content

Commit b55fc38

Browse files
committed
Print portforward stdio only on error
Signed-off-by: Sascha Grunert <[email protected]>
1 parent 6c138dd commit b55fc38

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pkg/validate/streaming.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"io"
2424
"net/http"
2525
"net/url"
26-
"os"
2726
"strings"
2827
"sync"
2928
"time"
@@ -335,14 +334,18 @@ func checkPortForward(c internalapi.RuntimeService, portForwardSeverURL string,
335334
framework.ExpectNoError(err, "failed to create spdy round tripper")
336335
parsedURL := parseURL(c, portForwardSeverURL)
337336
dialer := spdy.NewDialer(upgrader, &http.Client{Transport: transport}, "POST", parsedURL)
338-
pf, err := portforward.New(dialer, []string{fmt.Sprintf("%d:%d", hostPort, containerPort)}, stopChan, readyChan, os.Stdout, os.Stderr)
337+
338+
stdout := &bytes.Buffer{}
339+
stderr := &bytes.Buffer{}
340+
341+
pf, err := portforward.New(dialer, []string{fmt.Sprintf("%d:%d", hostPort, containerPort)}, stopChan, readyChan, stdout, stderr)
339342
framework.ExpectNoError(err, "failed to create port forward for %q", portForwardSeverURL)
340343

341344
go func() {
342345
defer GinkgoRecover()
343346
By("start port forward")
344-
err = pf.ForwardPorts()
345-
framework.ExpectNoError(err, "failed to start port forward for %q", portForwardSeverURL)
347+
err := pf.ForwardPorts()
348+
framework.ExpectNoError(err, "failed to start port forward for %q, stdout: %s, stderr: %s", portForwardSeverURL, stdout.String(), stderr.String())
346349
}()
347350

348351
By(fmt.Sprintf("check if we can get nginx main page via localhost:%d", hostPort))

0 commit comments

Comments
 (0)