Skip to content

Commit 9947372

Browse files
smothikimboersma
authored andcommitted
test(refactor_code) : refactor code added dockercliutils
1 parent d6e1f2d commit 9947372

7 files changed

Lines changed: 301 additions & 277 deletions

File tree

cache/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ test-unit:
3333
@echo no unit tests
3434

3535
test-functional:
36-
@echo no functional tests
36+
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./test/...

cache/test/cacheComponent_test.go

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package verbose
2+
3+
import (
4+
"github.com/deis/deis/tests/dockercliutils"
5+
"fmt"
6+
"testing"
7+
)
8+
9+
10+
11+
12+
func runDeisCacheTest(t *testing.T){
13+
cli,stdout,stdoutPipe := dockercliutils.GetNewClient( )
14+
15+
done := make(chan bool, 1)
16+
done1 :=make(chan bool, 1)
17+
18+
dockercliutils.BuildDockerfile(t,"../"," ")
19+
IPAddress := dockercliutils.GetInspectData(t,"{{ .NetworkSettings.IPAddress }}", "deis-etcd")
20+
fmt.Println(IPAddress+"IPADRESS")
21+
done <-true
22+
go func(){
23+
<- done
24+
fmt.Println("inside run cahce run continer")
25+
dockercliutils.RunContainer(t,cli,"--name","deis-cache","-p","6379:6379","-e","PUBLISH=6379","-e","HOST="+IPAddress,"deis/cache")
26+
}()
27+
dockercliutils.PrintToStdout(t,stdout,stdoutPipe,"Server started")
28+
29+
}
30+
31+
32+
func TestBuild(t *testing.T) {
33+
34+
fmt.Println("1st")
35+
//dockercliutils.RunEtcdTest(t)
36+
fmt.Println("2nd")
37+
runDeisCacheTest(t)
38+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package verbose
2+
3+
import (
4+
"github.com/deis/deis/tests/dockercliutils"
5+
"fmt"
6+
"testing"
7+
)
8+
9+
10+
11+
func runDeisLoggerTest(t *testing.T){
12+
cli,stdout,stdoutPipe := dockercliutils.GetNewClient( )
13+
done := make(chan bool, 1)
14+
dockercliutils.BuildDockerfile(t,"../"," ")
15+
dockercliutils.RunDeisDataTest(t,"--name", "deis-logger-data", "-v", "/var/log/deis", "deis/base", "true")
16+
IPAddress := dockercliutils.GetInspectData(t,"{{ .NetworkSettings.IPAddress }}", "deis-etcd")
17+
done <-true
18+
go func(){
19+
<- done
20+
fmt.Println("inside run etcd")
21+
dockercliutils.RunContainer(t,cli,"--name", "deis-logger", "-p", "514:514/udp", "-e", "PUBLISH=514", "-e", "HOST="+IPAddress, "--volumes-from", "deis-logger-data", "deis/logger")
22+
}()
23+
dockercliutils.PrintToStdout(t,stdout,stdoutPipe,"Booting")
24+
25+
}
26+
27+
28+
func TestBuild(t *testing.T) {
29+
30+
fmt.Println("1st")
31+
dockercliutils.RunEtcdTest(t)
32+
fmt.Println("2nd")
33+
34+
fmt.Println("3rd")
35+
36+
runDeisLoggerTest(t)
37+
38+
39+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package verbose
2+
3+
import (
4+
"github.com/deis/deis/tests/dockercliutils"
5+
"fmt"
6+
"testing"
7+
)
8+
9+
10+
11+
func runDeisRegistryTest(t *testing.T){
12+
cli,stdout,stdoutPipe := dockercliutils.GetNewClient( )
13+
done := make(chan bool, 1)
14+
dockercliutils.BuildDockerfile(t,"../"," ")
15+
dockercliutils.RunDeisDataTest(t,"--name", "deis-registry-data", "-v", "/data", "deis/base", "/bin/true")
16+
IPAddress := dockercliutils.GetInspectData(t,"{{ .NetworkSettings.IPAddress }}", "deis-etcd")
17+
done <-true
18+
go func(){
19+
<- done
20+
fmt.Println("inside run etcd")
21+
dockercliutils.RunContainer(t,cli,"--name", "deis-registry", "-p", "5000:5000", "-e", "PUBLISH=5000", "-e", "HOST="+IPAddress, "--volumes-from", "deis-registry-data", "deis/registry")
22+
}()
23+
dockercliutils.PrintToStdout(t,stdout,stdoutPipe,"Booting")
24+
25+
}
26+
27+
28+
func TestBuild(t *testing.T) {
29+
30+
fmt.Println("1st")
31+
dockercliutils.RunEtcdTest(t)
32+
fmt.Println("2nd")
33+
34+
fmt.Println("3rd")
35+
36+
runDeisRegistryTest(t)
37+
38+
39+
}

0 commit comments

Comments
 (0)