Skip to content

Commit 5b7f51a

Browse files
smothikimboersma
authored andcommitted
test(workingframework):framework working
Added component tests for all the services and tested .
1 parent 3f313c5 commit 5b7f51a

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

test/controllerComponent_test.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ func runDeisControllerTest(t *testing.T, testSessionUid string) {
1717
done := make(chan bool, 1)
1818
dockercliutils.BuildDockerfile(t, "../", "deis/controller:"+testSessionUid)
1919
//docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000 -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from=deis-logger deis/controller
20-
IPAddress := "172.17.8.100"
20+
IPAddress := func() string {
21+
var Ip string
22+
if utils.GetHostOs() == "darwin" {
23+
Ip = "172.17.8.100"
24+
}
25+
return Ip
26+
}()
2127
done <- true
2228
go func() {
2329
<-done
@@ -56,11 +62,11 @@ func TestBuild(t *testing.T) {
5662
fmt.Println("1st")
5763
var testSessionUid = utils.GetnewUuid()
5864
//testSessionUid := "352aea64"
59-
dockercliutils.RunEtcdTest(t, testSessionUid)
65+
dockercliutils.RunDummyEtcdTest(t, testSessionUid)
6066
fmt.Println("2nd")
6167
t.Logf("starting controller test: %v", testSessionUid)
6268
Controllerhandler := etcdutils.InitetcdValues(setdir, setkeys)
63-
etcdutils.PublishControllervalues(t, Controllerhandler)
69+
etcdutils.Publishvalues(t, Controllerhandler)
6470
fmt.Println("starting registry test")
6571
mockserviceutils.RunMockDatabase(t, testSessionUid)
6672
runDeisControllerTest(t, testSessionUid)

0 commit comments

Comments
 (0)