baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix url.Parse due to go1.12.8 changes.

Browse source
This commit is contained in:
Ludovic Fernandez 2019-08-14 18:16:04 +02:00 committed by Traefiker Bot
parent 51f7d9a07f
commit 5731ae7f47
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/middlewares/retry/retry_test.go
View file

@ -6,6 +6,7 @@ import (
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"net/http/httptrace" "net/http/httptrace"
"strconv"
"strings" "strings"
"testing" "testing"
@ -38,7 +39,7 @@ func TestRetry(t *testing.T) {
desc: "no retry when max request attempts is one", desc: "no retry when max request attempts is one",
config: dynamic.Retry{Attempts: 1}, config: dynamic.Retry{Attempts: 1},
wantRetryAttempts: 0, wantRetryAttempts: 0,
wantResponseStatus: http.StatusInternalServerError, wantResponseStatus: http.StatusBadGateway,
amountFaultyEndpoints: 1, amountFaultyEndpoints: 1,
}, },
{ {
@ -59,7 +60,7 @@ func TestRetry(t *testing.T) {
desc: "max attempts exhausted delivers the 5xx response", desc: "max attempts exhausted delivers the 5xx response",
config: dynamic.Retry{Attempts: 3}, config: dynamic.Retry{Attempts: 3},
wantRetryAttempts: 2, wantRetryAttempts: 2,
wantResponseStatus: http.StatusInternalServerError, wantResponseStatus: http.StatusBadGateway,
amountFaultyEndpoints: 3, amountFaultyEndpoints: 3,
}, },
} }
@ -83,13 +84,14 @@ func TestRetry(t *testing.T) {
loadBalancer, err := roundrobin.New(forwarder) loadBalancer, err := roundrobin.New(forwarder)
require.NoError(t, err) require.NoError(t, err)
basePort := 33444 // out of range port
basePort := 1133444
for i := 0; i < test.amountFaultyEndpoints; i++ { for i := 0; i < test.amountFaultyEndpoints; i++ {
// 192.0.2.0 is a non-routable IP for testing purposes. // 192.0.2.0 is a non-routable IP for testing purposes.
// See: https://stackoverflow.com/questions/528538/non-routable-ip-address/18436928#18436928 // See: https://stackoverflow.com/questions/528538/non-routable-ip-address/18436928#18436928
// We only use the port specification here because the URL is used as identifier // We only use the port specification here because the URL is used as identifier
// in the load balancer and using the exact same URL would not add a new server. // in the load balancer and using the exact same URL would not add a new server.
err = loadBalancer.UpsertServer(testhelpers.MustParseURL("http://192.0.2.0:" + string(basePort+i))) err = loadBalancer.UpsertServer(testhelpers.MustParseURL("http://192.0.2.0:" + strconv.Itoa(basePort+i)))
require.NoError(t, err) require.NoError(t, err)
} }
@ -277,13 +279,14 @@ func TestRetryWebsocket(t *testing.T) {
t.Fatalf("Error creating load balancer: %v", err) t.Fatalf("Error creating load balancer: %v", err)
} }
basePort := 33444 // out of range port
basePort := 1133444
for i := 0; i < test.amountFaultyEndpoints; i++ { for i := 0; i < test.amountFaultyEndpoints; i++ {
// 192.0.2.0 is a non-routable IP for testing purposes. // 192.0.2.0 is a non-routable IP for testing purposes.
// See: https://stackoverflow.com/questions/528538/non-routable-ip-address/18436928#18436928 // See: https://stackoverflow.com/questions/528538/non-routable-ip-address/18436928#18436928
// We only use the port specification here because the URL is used as identifier // We only use the port specification here because the URL is used as identifier
// in the load balancer and using the exact same URL would not add a new server. // in the load balancer and using the exact same URL would not add a new server.
_ = loadBalancer.UpsertServer(testhelpers.MustParseURL("http://192.0.2.0:" + string(basePort+i))) _ = loadBalancer.UpsertServer(testhelpers.MustParseURL("http://192.0.2.0:" + strconv.Itoa(basePort+i)))
} }
// add the functioning server to the end of the load balancer list // add the functioning server to the end of the load balancer list