github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Alfonso Acosta
2017-03-07 13:53:17 +00:00
parent c1fa5bb665
commit fb64f1102f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
probe/kubernetes/kubelet_test.go
View File

@@ -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)
}

10
probe/kubernetes/reporter_test.go
View File

@@ -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
{