refactor(tests): add etcd and mock utility packages

Author: smothiki

test/controllerComponent_test.go

@@ -3,39 +3,38 @@ package verbose
 import (
 	"fmt"
 	"github.com/deis/deis/tests/dockercliutils"
+	"github.com/deis/deis/tests/etcdutils"
+	"github.com/deis/deis/tests/mockserviceutils"
 	"github.com/deis/deis/tests/utils"
 	"net/http"
 	"strings"
 	"testing"
 	"time"
 )
 
-func runDeisRegistryTest(t *testing.T, testSessionUid string) {
+func runDeisControllerTest(t *testing.T, testSessionUid string) {
 	cli, stdout, stdoutPipe := dockercliutils.GetNewClient()
 	done := make(chan bool, 1)
-	dockercliutils.BuildDockerfile(t, "../", "deis/registry:"+testSessionUid)
-	dockercliutils.RunDeisDataTest(t, "--name", "deis-registry-data", "-v", "/data", "deis/base", "/bin/true")
-	IPAddress := dockercliutils.GetInspectData(t, "{{ .NetworkSettings.IPAddress }}", "deis-etcd-"+testSessionUid)
-	if strings.Contains(IPAddress, "Error") {
-		t.Fatalf("worng IP %s", IPAddress)
-	}
+	dockercliutils.BuildDockerfile(t, "../", "deis/controller:"+testSessionUid)
+	//docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000 -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from=deis-logger deis/controller
+	IPAddress := "172.17.8.100"
 	done <- true
 	go func() {
 		<-done
 		fmt.Println("inside run container")
-		dockercliutils.RunContainer(t, cli, "--name", "deis-registry-"+testSessionUid, "-p", "5000:5000", "-e", "PUBLISH=5000", "-e", "HOST="+IPAddress, "--volumes-from", "deis-registry-data", "deis/registry:"+testSessionUid)
+		dockercliutils.RunContainer(t, cli, "--name", "deis-controller-"+testSessionUid, "-p", "8000:8000", "-e", "PUBLISH=8000", "-e", "HOST="+IPAddress, "deis/controller:"+testSessionUid)
 	}()
-	time.Sleep(10000 * time.Millisecond)
+	time.Sleep(5000 * time.Millisecond)
 	dockercliutils.PrintToStdout(t, stdout, stdoutPipe, "Booting")
 
 }
 
-func deisRegistryServiceTest(t *testing.T, testSessionUid string) {
-	IPAddress := dockercliutils.GetInspectData(t, "{{ .NetworkSettings.IPAddress }}", "deis-registry-"+testSessionUid)
+func deisControllerServiceTest(t *testing.T, testSessionUid string) {
+	IPAddress := dockercliutils.GetInspectData(t, "{{ .NetworkSettings.IPAddress }}", "deis-controller-"+testSessionUid)
 	if strings.Contains(IPAddress, "Error") {
 		t.Fatalf("worng IP %s", IPAddress)
 	}
-	url := "http://" + IPAddress + ":5000"
+	url := "http://" + IPAddress + ":8000"
 	response, err := http.Get(url)
 	if err != nil {
 		t.Fatalf("Not reachable %s", err)
@@ -44,16 +43,27 @@ func deisRegistryServiceTest(t *testing.T, testSessionUid string) {
 }
 
 func TestBuild(t *testing.T) {
-
+	setkeys := []string{"/deis/registry/protocol",
+		"deis/registry/host",
+		"/deis/registry/port",
+		"/deis/cache/host",
+		"/deis/cache/port"}
+	setdir := []string{"/deis/controller",
+		"/deis/cache",
+		"/deis/database",
+		"/deis/registry",
+		"/deis/domains"}
 	fmt.Println("1st")
 	var testSessionUid = utils.GetnewUuid()
-	testSessionUid = "352aea64"
+	//testSessionUid := "352aea64"
 	dockercliutils.RunEtcdTest(t, testSessionUid)
 	fmt.Println("2nd")
-	t.Logf("starting registry test: %v", testSessionUid)
+	t.Logf("starting controller test: %v", testSessionUid)
+	Controllerhandler := etcdutils.InitetcdValues(setdir, setkeys)
+	etcdutils.PublishControllervalues(t, Controllerhandler)
 	fmt.Println("starting registry test")
-	runDeisRegistryTest(t, testSessionUid)
-	deisRegistryServiceTest(t, testSessionUid)
+	mockserviceutils.RunMockDatabase(t, testSessionUid)
+	runDeisControllerTest(t, testSessionUid)
+	deisControllerServiceTest(t, testSessionUid)
 	dockercliutils.ClearTestSession(t, testSessionUid)
-
 }