Skip to content

Commit 54a67df

Browse files
committed
refactor(tests): remove unneeded docker history checks
1 parent 56054c6 commit 54a67df

2 files changed

Lines changed: 2 additions & 19 deletions

File tree

tests/dockercliutils/dockercliutils.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -314,24 +314,16 @@ func RunEtcdTest(t *testing.T, uid string, port string) {
314314
cli, stdout, stdoutPipe := GetNewClient()
315315
etcdImage := "deis/test-etcd:latest"
316316
done2 := make(chan bool, 1)
317-
ipaddr := utils.GetHostIPAddress()
318317
go func() {
319-
fmt.Printf("--- Check that %s is present\n", etcdImage)
320-
if err = cli.CmdHistory("-q", etcdImage); err != nil {
321-
err = nil
322-
if err = cli.CmdPull(etcdImage); err != nil {
323-
CloseWrap(stdout, stdoutPipe)
324-
return
325-
}
326-
}
327318
done2 <- true
319+
ipaddr := utils.GetHostIPAddress()
328320
err = RunContainer(cli,
329321
"--name", "deis-etcd-"+uid,
330322
"--rm",
331323
"-p", port+":"+port,
332324
"-e", "HOST_IP="+ipaddr,
333325
"-e", "ETCD_ADDR="+ipaddr+":"+port,
334-
"deis/test-etcd:latest")
326+
etcdImage)
335327
}()
336328
go func() {
337329
<-done2

tests/mockserviceutils/mockserviceutils.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package mockserviceutils
22

33
import (
4-
"fmt"
54
"testing"
65
"time"
76

@@ -20,14 +19,6 @@ func RunMockDatabase(t *testing.T, uid string, etcdPort string, dbPort string) {
2019
done <- true
2120
go func() {
2221
<-done
23-
fmt.Printf("--- Check that %s is present\n", dbImage)
24-
if err = cli.CmdHistory("-q", dbImage); err != nil {
25-
err = nil
26-
if err = cli.CmdPull(dbImage); err != nil {
27-
dockercliutils.CloseWrap(stdout, stdoutPipe)
28-
return
29-
}
30-
}
3122
err = dockercliutils.RunContainer(cli,
3223
"--name", "deis-test-database-"+uid,
3324
"--rm",

0 commit comments

Comments
 (0)