fix non-gofmt'd things

2014-09-24 14:27:10 -07:00
parent 50eb2cf59c
commit bb0cd95a83
11 changed files with 147 additions and 147 deletions
--- a/pkg/kubelet/server_test.go
+++ b/pkg/kubelet/server_test.go
@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -27,7 +28,6 @@ import (
 	"reflect"
 	"strings"
 	"testing"
-	"io"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -36,13 +36,13 @@ import (
 )

 type fakeKubelet struct {
-	infoFunc           func(name string) (api.PodInfo, error)
-	containerInfoFunc  func(podFullName, containerName string, req *info.ContainerInfoRequest) (*info.ContainerInfo, error)
-	rootInfoFunc       func(query *info.ContainerInfoRequest) (*info.ContainerInfo, error)
-	machineInfoFunc    func() (*info.MachineInfo, error)
-	logFunc            func(w http.ResponseWriter, req *http.Request)
-	runFunc            func(podFullName, uuid, containerName string, cmd []string) ([]byte, error)
-	containerLogsFunc  func(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer)  error
+	infoFunc          func(name string) (api.PodInfo, error)
+	containerInfoFunc func(podFullName, containerName string, req *info.ContainerInfoRequest) (*info.ContainerInfo, error)
+	rootInfoFunc      func(query *info.ContainerInfoRequest) (*info.ContainerInfo, error)
+	machineInfoFunc   func() (*info.MachineInfo, error)
+	logFunc           func(w http.ResponseWriter, req *http.Request)
+	runFunc           func(podFullName, uuid, containerName string, cmd []string) ([]byte, error)
+	containerLogsFunc func(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer) error
 }

 func (fk *fakeKubelet) GetPodInfo(name, uuid string) (api.PodInfo, error) {
@@ -355,119 +355,119 @@ func TestServeRunInContainerWithUUID(t *testing.T) {
 }

 func TestContainerLogs(t *testing.T) {
-    fw := newServerTest()
-    output := "foo bar"
-    podName := "foo"
-    expectedPodName := podName + ".etcd"
-    expectedContainerName := "baz"
-    expectedTail := ""
-    expectedFollow := false
-    // expected := api.Container{"goodpod": docker.Container{ID: "myContainerID"}}
-    fw.fakeKubelet.containerLogsFunc = func(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer) error {
-            if podFullName != expectedPodName {
-                    t.Errorf("expected %s, got %s", expectedPodName, podFullName)
-            }
-			if containerName != expectedContainerName {
-				t.Errorf("expected %s, got %s", expectedContainerName, containerName)
-			}
-            if tail != expectedTail {
-                    t.Errorf("expected %s, got %s", expectedTail, tail)
-            }
-            if follow != expectedFollow {
-                    t.Errorf("expected %t, got %t", expectedFollow, follow)
-            }
-            return nil
-    }
-    resp, err := http.Get(fw.testHTTPServer.URL+"/containerLogs/" + podName + "/" + expectedContainerName)
-    if err != nil {
-            t.Errorf("Got error GETing: %v", err)
-    }
-    defer resp.Body.Close()
+	fw := newServerTest()
+	output := "foo bar"
+	podName := "foo"
+	expectedPodName := podName + ".etcd"
+	expectedContainerName := "baz"
+	expectedTail := ""
+	expectedFollow := false
+	// expected := api.Container{"goodpod": docker.Container{ID: "myContainerID"}}
+	fw.fakeKubelet.containerLogsFunc = func(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer) error {
+		if podFullName != expectedPodName {
+			t.Errorf("expected %s, got %s", expectedPodName, podFullName)
+		}
+		if containerName != expectedContainerName {
+			t.Errorf("expected %s, got %s", expectedContainerName, containerName)
+		}
+		if tail != expectedTail {
+			t.Errorf("expected %s, got %s", expectedTail, tail)
+		}
+		if follow != expectedFollow {
+			t.Errorf("expected %t, got %t", expectedFollow, follow)
+		}
+		return nil
+	}
+	resp, err := http.Get(fw.testHTTPServer.URL + "/containerLogs/" + podName + "/" + expectedContainerName)
+	if err != nil {
+		t.Errorf("Got error GETing: %v", err)
+	}
+	defer resp.Body.Close()

-    body, err := ioutil.ReadAll(resp.Body)
-    if err != nil {
-            t.Errorf("Error reading container logs: %v", err)
-    }
-    result := string(body)
-    if result != string(body) {
-            t.Errorf("Expected: '%v', got: '%v'", output, result)
-    }
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Errorf("Error reading container logs: %v", err)
+	}
+	result := string(body)
+	if result != string(body) {
+		t.Errorf("Expected: '%v', got: '%v'", output, result)
+	}
 }

 func TestContainerLogsWithTail(t *testing.T) {
-    fw := newServerTest()
-    output := "foo bar"
-    podName := "foo"
-    expectedPodName := podName + ".etcd"
-    expectedContainerName := "baz"
-    expectedTail := "5"
-    expectedFollow := false
-    fw.fakeKubelet.containerLogsFunc = func(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer) error {
-            if podFullName != expectedPodName {
-                    t.Errorf("expected %s, got %s", expectedPodName, podFullName)
-            }
-			if containerName != expectedContainerName {
-				t.Errorf("expected %s, got %s", expectedContainerName, containerName)
-			}
-            if tail != expectedTail {
-                    t.Errorf("expected %s, got %s", expectedTail, tail)
-            }
-            if follow != expectedFollow {
-                    t.Errorf("expected %t, got %t", expectedFollow, follow)
-            }
-            return nil
-    }
-    resp, err := http.Get(fw.testHTTPServer.URL+"/containerLogs/" + podName + "/" + expectedContainerName + "?tail=5")
-    if err != nil {
-            t.Errorf("Got error GETing: %v", err)
-    }
-    defer resp.Body.Close()
+	fw := newServerTest()
+	output := "foo bar"
+	podName := "foo"
+	expectedPodName := podName + ".etcd"
+	expectedContainerName := "baz"
+	expectedTail := "5"
+	expectedFollow := false
+	fw.fakeKubelet.containerLogsFunc = func(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer) error {
+		if podFullName != expectedPodName {
+			t.Errorf("expected %s, got %s", expectedPodName, podFullName)
+		}
+		if containerName != expectedContainerName {
+			t.Errorf("expected %s, got %s", expectedContainerName, containerName)
+		}
+		if tail != expectedTail {
+			t.Errorf("expected %s, got %s", expectedTail, tail)
+		}
+		if follow != expectedFollow {
+			t.Errorf("expected %t, got %t", expectedFollow, follow)
+		}
+		return nil
+	}
+	resp, err := http.Get(fw.testHTTPServer.URL + "/containerLogs/" + podName + "/" + expectedContainerName + "?tail=5")
+	if err != nil {
+		t.Errorf("Got error GETing: %v", err)
+	}
+	defer resp.Body.Close()

-    body, err := ioutil.ReadAll(resp.Body)
-    if err != nil {
-            t.Errorf("Error reading container logs: %v", err)
-    }
-    result := string(body)
-    if result != string(body) {
-            t.Errorf("Expected: '%v', got: '%v'", output, result)
-    }
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Errorf("Error reading container logs: %v", err)
+	}
+	result := string(body)
+	if result != string(body) {
+		t.Errorf("Expected: '%v', got: '%v'", output, result)
+	}
 }

 func TestContainerLogsWithFollow(t *testing.T) {
-    fw := newServerTest()
-    output := "foo bar"
-    podName := "foo"
-    expectedPodName := podName + ".etcd"
-    expectedContainerName := "baz"
-    expectedTail := ""
-    expectedFollow := true
-    fw.fakeKubelet.containerLogsFunc = func(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer) error {
-            if podFullName != expectedPodName {
-                    t.Errorf("expected %s, got %s", expectedPodName, podFullName)
-            }
-			if containerName != expectedContainerName {
-				t.Errorf("expected %s, got %s", expectedContainerName, containerName)
-			}
-            if tail != expectedTail {
-                    t.Errorf("expected %s, got %s", expectedTail, tail)
-            }
-            if follow != expectedFollow {
-                    t.Errorf("expected %t, got %t", expectedFollow, follow)
-            }
-            return nil
-    }
-    resp, err := http.Get(fw.testHTTPServer.URL+"/containerLogs/" + podName + "/" + expectedContainerName + "?follow=1")
-    if err != nil {
-            t.Errorf("Got error GETing: %v", err)
-    }
-    defer resp.Body.Close()
+	fw := newServerTest()
+	output := "foo bar"
+	podName := "foo"
+	expectedPodName := podName + ".etcd"
+	expectedContainerName := "baz"
+	expectedTail := ""
+	expectedFollow := true
+	fw.fakeKubelet.containerLogsFunc = func(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer) error {
+		if podFullName != expectedPodName {
+			t.Errorf("expected %s, got %s", expectedPodName, podFullName)
+		}
+		if containerName != expectedContainerName {
+			t.Errorf("expected %s, got %s", expectedContainerName, containerName)
+		}
+		if tail != expectedTail {
+			t.Errorf("expected %s, got %s", expectedTail, tail)
+		}
+		if follow != expectedFollow {
+			t.Errorf("expected %t, got %t", expectedFollow, follow)
+		}
+		return nil
+	}
+	resp, err := http.Get(fw.testHTTPServer.URL + "/containerLogs/" + podName + "/" + expectedContainerName + "?follow=1")
+	if err != nil {
+		t.Errorf("Got error GETing: %v", err)
+	}
+	defer resp.Body.Close()

-    body, err := ioutil.ReadAll(resp.Body)
-    if err != nil {
-            t.Errorf("Error reading container logs: %v", err)
-    }
-    result := string(body)
-    if result != string(body) {
-            t.Errorf("Expected: '%v', got: '%v'", output, result)
-    }
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Errorf("Error reading container logs: %v", err)
+	}
+	result := string(body)
+	if result != string(body) {
+		t.Errorf("Expected: '%v', got: '%v'", output, result)
+	}
 }