Merge branch v2.11 into v3.0
This commit is contained in:
commit
34bd611131
16 changed files with 142 additions and 391 deletions
|
@ -13,7 +13,6 @@ import (
|
|||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
ptypes "github.com/traefik/paerser/types"
|
||||
"github.com/traefik/traefik/v3/pkg/config/runtime"
|
||||
"github.com/traefik/traefik/v3/pkg/config/static"
|
||||
)
|
||||
|
@ -56,11 +55,9 @@ func TestHandler_EntryPoints(t *testing.T) {
|
|||
GraceTimeOut: 2,
|
||||
},
|
||||
RespondingTimeouts: &static.RespondingTimeouts{
|
||||
HTTP: &static.HTTPRespondingTimeouts{
|
||||
ReadTimeout: paerserDurationPtr(3),
|
||||
WriteTimeout: paerserDurationPtr(4),
|
||||
IdleTimeout: paerserDurationPtr(5),
|
||||
},
|
||||
ReadTimeout: 3,
|
||||
WriteTimeout: 4,
|
||||
IdleTimeout: 5,
|
||||
},
|
||||
},
|
||||
ProxyProtocol: &static.ProxyProtocol{
|
||||
|
@ -80,11 +77,9 @@ func TestHandler_EntryPoints(t *testing.T) {
|
|||
GraceTimeOut: 20,
|
||||
},
|
||||
RespondingTimeouts: &static.RespondingTimeouts{
|
||||
HTTP: &static.HTTPRespondingTimeouts{
|
||||
ReadTimeout: paerserDurationPtr(3),
|
||||
WriteTimeout: paerserDurationPtr(4),
|
||||
IdleTimeout: paerserDurationPtr(5),
|
||||
},
|
||||
ReadTimeout: 30,
|
||||
WriteTimeout: 40,
|
||||
IdleTimeout: 50,
|
||||
},
|
||||
},
|
||||
ProxyProtocol: &static.ProxyProtocol{
|
||||
|
@ -268,8 +263,3 @@ func generateEntryPoints(nb int) map[string]*static.EntryPoint {
|
|||
|
||||
return eps
|
||||
}
|
||||
|
||||
func paerserDurationPtr(duration int) *ptypes.Duration {
|
||||
d := ptypes.Duration(duration)
|
||||
return &d
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue