homelab/traefik
1
0
Fork 0
Code Activity

Remove Deprecated Step 1

Browse source
This commit is contained in:
Jean-Baptiste Doumenjou 2018-07-31 19:28:03 +02:00 • committed by Traefiker Bot
parent 1d53077fc7
commit 8627256e74
68 changed files with 168 additions and 1695 deletions
Download patch file Download diff file Expand all files Collapse all files

27
provider/kv/kv_config_test.go
View file

@ -7,7 +7,7 @@ import (
"time"
"github.com/abronan/valkeyrie/store"
"github.com/containous/flaeg"
"github.com/containous/flaeg/parse"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
@ -253,7 +253,6 @@ func TestProviderBuildConfiguration(t *testing.T) {
backend("backend1",
withPair(pathBackendCircuitBreakerExpression, label.DefaultCircuitBreakerExpression),
withPair(pathBackendLoadBalancerMethod, "drr"),
withPair(pathBackendLoadBalancerSticky, "true"),
withPair(pathBackendLoadBalancerStickiness, "true"),
withPair(pathBackendLoadBalancerStickinessCookieName, "tomate"),
withPair(pathBackendHealthCheckScheme, "http"),
@ -362,7 +361,6 @@ func TestProviderBuildConfiguration(t *testing.T) {
},
LoadBalancer: &types.LoadBalancer{
Method: "drr",
Sticky: true,
Stickiness: &types.Stickiness{
CookieName: "tomate",
},
@ -432,12 +430,12 @@ func TestProviderBuildConfiguration(t *testing.T) {
"foo": {
Average: 6,
Burst: 12,
Period: flaeg.Duration(18 * time.Second),
Period: parse.Duration(18 * time.Second),
},
"bar": {
Average: 3,
Burst: 6,
Period: flaeg.Duration(9 * time.Second),
Period: parse.Duration(9 * time.Second),
},
},
},
@ -1244,7 +1242,7 @@ func TestProviderHasStickinessLabel(t *testing.T) {
},
}
actual := p.hasStickinessLabel(test.rootPath)
actual := p.getLoadBalancer(test.rootPath).Stickiness != nil
if actual != test.expected {
t.Fatalf("expected %v, got %v", test.expected, actual)
@ -1474,12 +1472,12 @@ func TestProviderGetRateLimit(t *testing.T) {
"foo": {
Average: 6,
Burst: 12,
Period: flaeg.Duration(18 * time.Second),
Period: parse.Duration(18 * time.Second),
},
"bar": {
Average: 3,
Burst: 6,
Period: flaeg.Duration(9 * time.Second),
Period: parse.Duration(9 * time.Second),
},
},
},
@ -1794,12 +1792,10 @@ func TestProviderGetLoadBalancer(t *testing.T) {
kvPairs: filler("traefik",
backend("foo",
withPair(pathBackendLoadBalancerMethod, "drr"),
withPair(pathBackendLoadBalancerSticky, "true"),
withPair(pathBackendLoadBalancerStickiness, "true"),
withPair(pathBackendLoadBalancerStickinessCookieName, "aubergine"))),
expected: &types.LoadBalancer{
Method: "drr",
Sticky: true,
Stickiness: &types.Stickiness{
CookieName: "aubergine",
},
@ -1823,17 +1819,6 @@ func TestProviderGetLoadBalancer(t *testing.T) {
Method: "drr",
},
},
{
desc: "when sticky is set",
rootPath: "traefik/backends/foo",
kvPairs: filler("traefik",
backend("foo",
withPair(pathBackendLoadBalancerSticky, "true"))),
expected: &types.LoadBalancer{
Method: "wrr",
Sticky: true,
},
},
{
desc: "when stickiness is set",
rootPath: "traefik/backends/foo",