Merge pull request #324 from thaJeztah/18.09_backport_harden_TestClientWithRequestTimeout
[18.09 backport] Harden TestClientWithRequestTimeout
diff --git a/pkg/plugins/client_test.go b/pkg/plugins/client_test.go
index c3a4892..12f67db 100644
--- a/pkg/plugins/client_test.go
+++ b/pkg/plugins/client_test.go
@@ -2,7 +2,6 @@
import (
"bytes"
- "context"
"encoding/json"
"io"
"net/http"
@@ -237,6 +236,10 @@
}
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)
@@ -251,12 +254,8 @@
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 {
