From d83f407e437624be5b7b214cc4a1ccb4e0cc3db3 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Mon, 9 Jun 2014 16:50:44 -0700
Subject: [PATCH] Fix tests.

---
 pkg/kubelet/kubelet_server_test.go | 10 +++++-----
 pkg/kubelet/kubelet_test.go        | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkg/kubelet/kubelet_server_test.go b/pkg/kubelet/kubelet_server_test.go
index 32f39782050..ac9ddd4c3a6 100644
--- a/pkg/kubelet/kubelet_server_test.go
+++ b/pkg/kubelet/kubelet_server_test.go
@@ -16,14 +16,14 @@ import (
 
 type fakeKubelet struct {
 	infoFunc func(name string) (string, error)
-	idFunc   func(name string) (string, error)
+	idFunc   func(name string) (string, bool, error)
 }
 
 func (fk *fakeKubelet) GetContainerInfo(name string) (string, error) {
 	return fk.infoFunc(name)
 }
 
-func (fk *fakeKubelet) GetContainerID(name string) (string, error) {
+func (fk *fakeKubelet) GetContainerID(name string) (string, bool, error) {
 	return fk.idFunc(name)
 }
 
@@ -105,11 +105,11 @@ func TestContainer(t *testing.T) {
 func TestContainerInfo(t *testing.T) {
 	fw := makeServerTest()
 	expected := "good container info string"
-	fw.fakeKubelet.idFunc = func(name string) (string, error) {
+	fw.fakeKubelet.idFunc = func(name string) (string, bool, error) {
 		if name == "goodcontainer" {
-			return name, nil
+			return name, true, nil
 		}
-		return "", fmt.Errorf("bad container")
+		return "", false, fmt.Errorf("bad container")
 	}
 	fw.fakeKubelet.infoFunc = func(name string) (string, error) {
 		if name == "goodcontainer" {
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index e4adc8b5d34..80e67280e4e 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -150,6 +150,12 @@ func verifyPackUnpack(t *testing.T, manifestId, containerName string) {
 	}
 }
 
+func verifyBoolean(t *testing.T, expected, value bool) {
+	if expected != value {
+		t.Errorf("Unexpected boolean.  Expected %s.  Found %s", expected, value)
+	}
+}
+
 func TestContainerManifestNaming(t *testing.T) {
 	verifyPackUnpack(t, "manifest1234", "container5678")
 	verifyPackUnpack(t, "manifest--", "container__")
@@ -211,20 +217,23 @@ func TestGetContainerID(t *testing.T) {
 		},
 	}
 
-	id, err := kubelet.GetContainerID("foo")
+	id, found, err := kubelet.GetContainerID("foo")
+	verifyBoolean(t, true, found)
 	verifyStringEquals(t, id, "1234")
 	verifyNoError(t, err)
 	verifyCalls(t, fakeDocker, []string{"list"})
 	fakeDocker.clearCalls()
 
-	id, err = kubelet.GetContainerID("bar")
+	id, found, err = kubelet.GetContainerID("bar")
+	verifyBoolean(t, true, found)
 	verifyStringEquals(t, id, "4567")
 	verifyNoError(t, err)
 	verifyCalls(t, fakeDocker, []string{"list"})
 	fakeDocker.clearCalls()
 
-	id, err = kubelet.GetContainerID("NotFound")
-	verifyError(t, err)
+	id, found, err = kubelet.GetContainerID("NotFound")
+	verifyBoolean(t, false, found)
+	verifyNoError(t, err)
 	verifyCalls(t, fakeDocker, []string{"list"})
 }