Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Harden TestClientWithRequestTimeout #325

Merged
andrewhsu merged 1 commit into from
Aug 14, 2019
Merged

[19.03 backport] Harden TestClientWithRequestTimeout #325

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
13 changes: 6 additions & 7 deletions pkg/plugins/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package plugins // import "github.com/docker/docker/pkg/plugins"

import (
"bytes"
"context"
"encoding/json"
"io"
"net/http"
Expand Down Expand Up @@ -237,6 +236,10 @@ func TestClientSendFile(t *testing.T) {
}

func TestClientWithRequestTimeout(t *testing.T) {
type timeoutError interface {
Timeout() bool
}

timeout := 1 * time.Millisecond
testHandler := func(w http.ResponseWriter, r *http.Request) {
time.Sleep(timeout + 1*time.Millisecond)
Expand All @@ -251,12 +254,8 @@ func TestClientWithRequestTimeout(t *testing.T) {
assert.Assert(t, is.ErrorContains(err, ""), "expected error")

err = errors.Cause(err)

switch e := err.(type) {
case *url.Error:
err = e.Err
}
assert.DeepEqual(t, context.DeadlineExceeded, err)
assert.ErrorType(t, err, (*timeoutError)(nil))
assert.Equal(t, err.(timeoutError).Timeout(), true)
}

type testRequestWrapper struct {
Expand Down