Skip to content

[Backport release-1.34] Fix internal/http/TestDownload_CancelDownload #6713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release-1.34
Choose a base branch
from
Open

[Backport release-1.34] Fix internal/http/TestDownload_CancelDownload #6713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions internal/http/download_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"strings"
"sync/atomic"
"testing"
"time"

"github.com/k0sproject/k0s/internal/testutil"

Expand Down Expand Up @@ -79,18 +78,21 @@ func TestDownload_ExcessContentLength(t *testing.T) {
func TestDownload_CancelDownload(t *testing.T) {
ctx, cancel := context.WithCancelCause(t.Context())

requestDone := make(chan struct{})
baseURL := startFakeDownloadServer(t, false, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
for {
if _, err := w.Write([]byte(t.Name())); !assert.NoError(t, err) {
return
}

select {
case <-r.Context().Done():
return
case <-time.After(time.Microsecond):
}
defer close(requestDone)
if _, err := w.Write([]byte(t.Name())); !assert.NoError(t, err) {
return
}

// Need to flush here, otherwise the internal response buffering will
// prevent the client from receiving the data.
w.(http.Flusher).Flush()

// Wait for the client to cancel the in-flight request.
ctx := r.Context()
<-ctx.Done()
assert.Same(t, context.Canceled, context.Cause(ctx), "HTTP request context wasn't canceled while writing response")
}))

err := internalhttp.Download(ctx, baseURL, internalio.WriterFunc(func(p []byte) (int, error) {
Expand All @@ -100,6 +102,10 @@ func TestDownload_CancelDownload(t *testing.T) {

assert.ErrorContains(t, err, "while downloading: ")
assert.ErrorIs(t, err, assert.AnError)

// Make sure the server's HTTP handler has finished
// so all the assertions have been made.
<-requestDone
}

func TestDownload_RedirectLoop(t *testing.T) {
Expand Down
Loading