github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123460 from liggitt/drain-proxy-output

Browse Source 
Fix kubectl proxy e2e test
This commit is contained in:
Kubernetes Prow Robot 2024-02-22 21:49:53 -08:00 committed by GitHub
commit 003f4c5de4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/kubectl/kubectl.go
View File

@ -2218,13 +2218,21 @@ func startProxyServer(ns string) (int, *exec.Cmd, error) {
if err != nil { if err != nil {
return -1, nil, err return -1, nil, err
} }
defer stdout.Close()
defer stderr.Close()
buf := make([]byte, 128) buf := make([]byte, 128)
var n int var n int
if n, err = stdout.Read(buf); err != nil { if n, err = stdout.Read(buf); err != nil {
return -1, cmd, fmt.Errorf("Failed to read from kubectl proxy stdout: %w", err) return -1, cmd, fmt.Errorf("Failed to read from kubectl proxy stdout: %w", err)
} }
go func() {
out, _ := io.ReadAll(stdout)
framework.Logf("kubectl proxy stdout: %s", string(buf[:n])+string(out))
stdout.Close()
}()
go func() {
err, _ := io.ReadAll(stderr)
framework.Logf("kubectl proxy stderr: %s", string(err))
stderr.Close()
}()
output := string(buf[:n]) output := string(buf[:n])
match := proxyRegexp.FindStringSubmatch(output) match := proxyRegexp.FindStringSubmatch(output)
if len(match) == 2 { if len(match) == 2 {