github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136332 from seans3/websocket-test-logging

Browse Source 
Adds more websocket flaky test logging
This commit is contained in:
Kubernetes Prow Robot
2026-01-21 22:21:26 +05:30
committed by GitHub
parent 25ae8f3e38 3975b1edca
commit 724f7a99c1
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
staging/src/k8s.io/apiserver/pkg/util/proxy/streamtranslator_test.go
View File

@@ -28,6 +28,7 @@ import (
mrand "math/rand"
"net/http"
"net/http/httptest"
"net/http/httputil"
"net/url"
"reflect"
"strings"
@@ -61,7 +62,7 @@ func TestStreamTranslator_LoopbackStdinToStdout(t *testing.T) {
t.Cleanup(metrics.ResetForTest)
// Create upstream fake SPDY server which copies STDIN back onto STDOUT stream.
spdyServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
ctx, err := createSPDYServerStreams(w, req, Options{
ctx, err := createSPDYServerStreams(t, w, req, Options{
Stdin: true,
Stdout: true,
})
@@ -162,7 +163,7 @@ func TestStreamTranslator_LoopbackStdinToStderr(t *testing.T) {
t.Cleanup(metrics.ResetForTest)
// Create upstream fake SPDY server which copies STDIN back onto STDERR stream.
spdyServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
ctx, err := createSPDYServerStreams(w, req, Options{
ctx, err := createSPDYServerStreams(t, w, req, Options{
Stdin: true,
Stderr: true,
})
@@ -267,7 +268,7 @@ func TestStreamTranslator_ErrorStream(t *testing.T) {
// Create upstream fake SPDY server, returning a non-zero exit code
// on error stream within the structured error.
spdyServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
ctx, err := createSPDYServerStreams(w, req, Options{
ctx, err := createSPDYServerStreams(t, w, req, Options{
Stdout: true,
})
if err != nil {
@@ -373,7 +374,7 @@ func TestStreamTranslator_MultipleReadChannels(t *testing.T) {
t.Cleanup(metrics.ResetForTest)
// Create upstream fake SPDY server which copies STDIN back onto STDOUT and STDERR stream.
spdyServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
ctx, err := createSPDYServerStreams(w, req, Options{
ctx, err := createSPDYServerStreams(t, w, req, Options{
Stdin: true,
Stdout: true,
Stderr: true,
@@ -478,7 +479,7 @@ apiserver_stream_translator_requests_total{code="200"} 1
func TestStreamTranslator_ThrottleReadChannels(t *testing.T) {
// Create upstream fake SPDY server which copies STDIN back onto STDOUT and STDERR stream.
spdyServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
ctx, err := createSPDYServerStreams(w, req, Options{
ctx, err := createSPDYServerStreams(t, w, req, Options{
Stdin: true,
Stdout: true,
Stderr: true,
@@ -621,7 +622,7 @@ func TestStreamTranslator_TTYResizeChannel(t *testing.T) {
actualTerminalSizes := make([]remotecommand.TerminalSize, 0, numSizeQueue)
// Create upstream fake SPDY server which copies STDIN back onto STDERR stream.
spdyServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
ctx, err := createSPDYServerStreams(w, req, Options{
ctx, err := createSPDYServerStreams(t, w, req, Options{
Tty: true,
})
if err != nil {
@@ -871,9 +872,23 @@ type streamAndReply struct {
// connection with remote command streams defined in passed options. Returns a streamContext
// structure containing the Reader/Writer streams to communicate through the SDPY connection.
// Returns an error if unable to upgrade the HTTP connection to a SPDY connection.
func createSPDYServerStreams(w http.ResponseWriter, req *http.Request, opts Options) (*streamContext, error) {
func createSPDYServerStreams(t *testing.T, w http.ResponseWriter, req *http.Request, opts Options) (*streamContext, error) {
_, err := httpstream.Handshake(req, w, []string{rcconstants.StreamProtocolV4Name})
if err != nil {
t.Log("------------------- [DEBUG] HANDSHAKE FAILED -------------------")
t.Logf("Method: %s", req.Method)
t.Logf("URL: %s", req.URL.String())
t.Logf("Proto: %s", req.Proto)
t.Logf("Header Count: %d", len(req.Header))
t.Logf("ContentLength: %d", req.ContentLength) // Should be zero for upgrade request
// Dump the request in its entirety.
dump, err := httputil.DumpRequest(req, true)
if err != nil {
t.Logf("DumpRequest failed: %v", err)
} else {
t.Logf("Full HTTP Request Dump:\n%s", dump)
}
return nil, err
}