From fb64f1102f476c92a349ca501f8771920238b42e Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@weave.works>
Date: Tue, 7 Mar 2017 13:53:17 +0000
Subject: [PATCH] Fix tests

---
 probe/kubernetes/kubelet_test.go  |  4 +++-
 probe/kubernetes/reporter_test.go | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/probe/kubernetes/kubelet_test.go b/probe/kubernetes/kubelet_test.go
index d29686ea6..31a6471c8 100644
--- a/probe/kubernetes/kubelet_test.go
+++ b/probe/kubernetes/kubelet_test.go
@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"testing"
 
 	"github.com/weaveworks/scope/probe/kubernetes"
@@ -31,7 +32,8 @@ func TestGetLocalPodUIDs(t *testing.T) {
 	))
 	defer server.Close()
 
-	uids, err := kubernetes.GetLocalPodUIDs(server.URL.Host)
+	serverURL, _ := url.Parse(server.URL)
+	uids, err := kubernetes.GetLocalPodUIDs(serverURL.Host)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
diff --git a/probe/kubernetes/reporter_test.go b/probe/kubernetes/reporter_test.go
index 7bf1e2852..25a868c5e 100644
--- a/probe/kubernetes/reporter_test.go
+++ b/probe/kubernetes/reporter_test.go
@@ -182,7 +182,7 @@ func (c mockPipeClient) PipeClose(appID, id string) error {
 func TestReporter(t *testing.T) {
 	oldGetNodeName := kubernetes.GetLocalPodUIDs
 	defer func() { kubernetes.GetLocalPodUIDs = oldGetNodeName }()
-	kubernetes.GetLocalPodUIDs = func() (map[string]struct{}, error) {
+	kubernetes.GetLocalPodUIDs = func(string) (map[string]struct{}, error) {
 		uids := map[string]struct{}{
 			pod1UID: {},
 			pod2UID: {},
@@ -194,7 +194,7 @@ func TestReporter(t *testing.T) {
 	pod2ID := report.MakePodNodeID(pod2UID)
 	serviceID := report.MakeServiceNodeID(serviceUID)
 	hr := controls.NewDefaultHandlerRegistry()
-	rpt, _ := kubernetes.NewReporter(newMockClient(), nil, "", "foo", nil, hr).Report()
+	rpt, _ := kubernetes.NewReporter(newMockClient(), nil, "", "foo", nil, hr, 0).Report()
 
 	// Reporter should have added the following pods
 	for _, pod := range []struct {
@@ -255,7 +255,7 @@ func TestTagger(t *testing.T) {
 	}))
 
 	hr := controls.NewDefaultHandlerRegistry()
-	rpt, err := kubernetes.NewReporter(newMockClient(), nil, "", "", nil, hr).Tag(rpt)
+	rpt, err := kubernetes.NewReporter(newMockClient(), nil, "", "", nil, hr, 0).Tag(rpt)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}
@@ -277,14 +277,14 @@ func (c *callbackReadCloser) Close() error { return c.close() }
 func TestReporterGetLogs(t *testing.T) {
 	oldGetNodeName := kubernetes.GetLocalPodUIDs
 	defer func() { kubernetes.GetLocalPodUIDs = oldGetNodeName }()
-	kubernetes.GetLocalPodUIDs = func() (map[string]struct{}, error) {
+	kubernetes.GetLocalPodUIDs = func(string) (map[string]struct{}, error) {
 		return map[string]struct{}{}, nil
 	}
 
 	client := newMockClient()
 	pipes := mockPipeClient{}
 	hr := controls.NewDefaultHandlerRegistry()
-	reporter := kubernetes.NewReporter(client, pipes, "", "", nil, hr)
+	reporter := kubernetes.NewReporter(client, pipes, "", "", nil, hr, 0)
 
 	// Should error on invalid IDs
 	{