ref(tests): move exported Test* funcs to top of files and tidy up code

Author: mboersma

builder/tests/builder_test.go

@@ -51,7 +51,7 @@ func TestBuilder(t *testing.T) {
 		"/deis/domains",
 		"/deis/services",
 	}
-	testID := utils.NewUuid()
+	testID := utils.NewID()
 	err := dockercliutils.BuildImage(t, "../", "deis/builder:"+testID)
 	if err != nil {
 		t.Fatal(err)

cache/tests/cache_test.go

@@ -29,7 +29,7 @@ func runDeisCacheTest(
 }
 
 func TestCache(t *testing.T) {
-	testID := utils.NewUuid()
+	testID := utils.NewID()
 	err := dockercliutils.BuildImage(t, "../", "deis/cache:"+testID)
 	if err != nil {
 		t.Fatal(err)

controller/tests/controller_test.go

@@ -45,7 +45,7 @@ func TestController(t *testing.T) {
 		"/deis/registry",
 		"/deis/domains",
 	}
-	testID := utils.NewUuid()
+	testID := utils.NewID()
 	err := dockercliutils.BuildImage(t, "../", "deis/controller:"+testID)
 	if err != nil {
 		t.Fatal(err)

database/tests/database_test.go

@@ -32,7 +32,7 @@ func runDeisDatabaseTest(
 }
 
 func TestDatabase(t *testing.T) {
-	testID := utils.NewUuid()
+	testID := utils.NewID()
 	err := dockercliutils.BuildImage(t, "../", "deis/database:"+testID)
 	if err != nil {
 		t.Fatal(err)

logger/tests/logger_test.go

@@ -32,7 +32,7 @@ func runDeisLoggerTest(
 }
 
 func TestLogger(t *testing.T) {
-	testID := utils.NewUuid()
+	testID := utils.NewID()
 	err := dockercliutils.BuildImage(t, "../", "deis/logger:"+testID)
 	if err != nil {
 		t.Fatal(err)

registry/tests/registry_test.go

@@ -40,7 +40,7 @@ func TestRegistry(t *testing.T) {
 	setdir := []string{
 		"/deis/cache",
 	}
-	testID := utils.NewUuid()
+	testID := utils.NewID()
 	err := dockercliutils.BuildImage(t, "../", "deis/registry:"+testID)
 	if err != nil {
 		t.Fatal(err)

router/tests/router_test.go

@@ -46,7 +46,7 @@ func TestRouter(t *testing.T) {
 		"/deis/builder",
 		"/deis/domains",
 	}
-	testID := utils.NewUuid()
+	testID := utils.NewID()
 	err := dockercliutils.BuildImage(t, "../", "deis/router:"+testID)
 	if err != nil {
 		t.Fatal(err)