diff --git a/middleware/kubernetes/kubernetes_test.go b/middleware/kubernetes/kubernetes_test.go index d740027f6..2003513a4 100644 --- a/middleware/kubernetes/kubernetes_test.go +++ b/middleware/kubernetes/kubernetes_test.go @@ -282,13 +282,9 @@ func TestIpFromPodName(t *testing.T) { type APIConnServiceTest struct{} -func (APIConnServiceTest) Run() { - return -} - -func (APIConnServiceTest) Stop() error { - return nil -} +func (APIConnServiceTest) Run() { return } +func (APIConnServiceTest) Stop() error { return nil } +func (APIConnServiceTest) PodIndex(string) []interface{} { return nil } func (APIConnServiceTest) ServiceList() []*api.Service { svcs := []*api.Service{ @@ -334,10 +330,6 @@ func (APIConnServiceTest) ServiceList() []*api.Service { } -func (APIConnServiceTest) PodIndex(string) []interface{} { - return nil -} - func (APIConnServiceTest) EndpointsList() api.EndpointsList { n := "test.node.foo.bar" @@ -437,6 +429,7 @@ func (APIConnServiceTest) GetNodeByName(name string) (api.Node, error) { }, }, nil } + func TestServices(t *testing.T) { k := Kubernetes{Zones: []string{"interwebs.test"}} diff --git a/middleware/kubernetes/ns_test.go b/middleware/kubernetes/ns_test.go index 6d3832ff6..03b18481d 100644 --- a/middleware/kubernetes/ns_test.go +++ b/middleware/kubernetes/ns_test.go @@ -55,13 +55,9 @@ func TestIsDefaultNS(t *testing.T) { type APIConnTest struct{} -func (APIConnTest) Run() { - return -} - -func (APIConnTest) Stop() error { - return nil -} +func (APIConnTest) Run() { return } +func (APIConnTest) Stop() error { return nil } +func (APIConnTest) PodIndex(string) []interface{} { return nil } func (APIConnTest) ServiceList() []*api.Service { svc := api.Service{ @@ -78,10 +74,6 @@ func (APIConnTest) ServiceList() []*api.Service { } -func (APIConnTest) PodIndex(string) []interface{} { - return nil -} - func (APIConnTest) EndpointsList() api.EndpointsList { return api.EndpointsList{ Items: []api.Endpoints{