homelab/traefik
1
0
Fork 0
Code Activity

Merge branch 'v1.5' into master

Browse source
This commit is contained in:
Fernandez Ludovic 2017-12-20 15:47:15 +01:00
commit 4a7297d05c
43 changed files with 667 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

4
provider/mesos/config_test.go
View file

@ -7,6 +7,7 @@ import (
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
"github.com/mesos/mesos-go/upid"
"github.com/mesosphere/mesos-dns/records/state"
"github.com/stretchr/testify/assert"
)
@ -262,6 +263,9 @@ func TestTaskRecords(t *testing.T) {
ID: "s_id",
Hostname: "127.0.0.1",
}
slave.PID.UPID = &upid.UPID{}
slave.PID.Host = slave.Hostname
var taskState = state.State{
Slaves: []state.Slave{slave},
Frameworks: []state.Framework{framework},