ref(tests): use mock-store container in functional tests

Author: mboersma

database/Makefile

@@ -49,5 +49,6 @@ test-unit:
 	@echo no unit tests
 
 test-functional:
+	@docker history deis/mock-store >/dev/null 2>&1 || $(MAKE) -C ../tests/ mock-store
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

registry/Makefile

@@ -49,5 +49,6 @@ test-unit:
 	@echo no unit tests
 
 test-functional:
+	@docker history deis/mock-store >/dev/null 2>&1 || $(MAKE) -C ../tests/ mock-store
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...

tests/mock/mock.go

@@ -57,30 +57,11 @@ func RunMockDatabase(t *testing.T, tag string, etcdPort string, dbPort string) {
 func RunMockCeph(t *testing.T, name string, cli *client.DockerCli, etcdPort string) {
 
 	etcdutils.SetSingle(t, "/deis/store/hosts/"+utils.HostAddress(), utils.HostAddress(), etcdPort)
-
-	// since we're only running one OSD, our default of 128 placement groups is too large
-	etcdutils.SetSingle(t, "/deis/store/pgNum", "64", etcdPort)
-
-	monitorName := name + "-monitor"
-	RunMockCephMonitor(t, monitorName, etcdPort)
-
-	daemonName := name + "-daemon"
-	RunMockCephDaemon(t, daemonName, etcdPort)
-
-	metadataName := name + "-metadata"
-	RunMockCephMetadata(t, metadataName, etcdPort)
-
-	gatewayName := name + "-gateway"
-	RunMockCephGateway(t, gatewayName, utils.RandomPort(), etcdPort)
-}
-
-// RunMockCephMonitor runs a Ceph Monitor agent
-func RunMockCephMonitor(t *testing.T, name string, etcdPort string) {
 	var err error
 	cli, stdout, stdoutPipe := dockercli.NewClient()
-	cephImage := "deis/store-monitor:" + utils.BuildTag()
+	cephImage := "deis/mock-store:latest"
 	ipaddr := utils.HostAddress()
-	fmt.Printf("--- Running deis/mock-ceph-monitor at %s\n", ipaddr)
+	fmt.Printf("--- Running deis/mock-store at %s\n", ipaddr)
 	done2 := make(chan bool, 1)
 	go func() {
 		done2 <- true
@@ -90,88 +71,9 @@ func RunMockCephMonitor(t *testing.T, name string, etcdPort string) {
 			"--rm",
 			"-e", "HOST="+ipaddr,
 			"-e", "ETCD_PORT="+etcdPort,
-			"-e", "NUM_STORES=1",
 			"--net=host",
 			cephImage)
 	}()
-	dockercli.PrintToStdout(t, stdout, stdoutPipe, "monmap e1: 1 mons at")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// RunMockCephDaemon sets up a single Ceph OSD
-func RunMockCephDaemon(t *testing.T, name string, etcdPort string) {
-	var err error
-	cli, stdout, stdoutPipe := dockercli.NewClient()
-	cephImage := "deis/store-daemon:" + utils.BuildTag()
-	ipaddr := utils.HostAddress()
-	fmt.Printf("--- Running deis/mock-ceph-daemon at %s\n", ipaddr)
-	done := make(chan bool, 1)
-	go func() {
-		done <- true
-		_ = cli.CmdRm("-f", name)
-		err = dockercli.RunContainer(cli,
-			"--name", name,
-			"--rm",
-			"-e", "HOST="+ipaddr,
-			"-e", "ETCD_PORT="+etcdPort,
-			"--net=host",
-			cephImage)
-	}()
-	dockercli.PrintToStdout(t, stdout, stdoutPipe, "journal close /var/lib/ceph/osd/ceph-0/journal")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// RunMockCephMetadata starts a mock Ceph MDS
-func RunMockCephMetadata(t *testing.T, name string, etcdPort string) {
-	var err error
-	cli, stdout, stdoutPipe := dockercli.NewClient()
-	cephImage := "deis/store-metadata:" + utils.BuildTag()
-	ipaddr := utils.HostAddress()
-	fmt.Printf("--- Running deis/mock-ceph-metadata at %s\n", ipaddr)
-	done2 := make(chan bool, 1)
-	go func() {
-		done2 <- true
-		_ = cli.CmdRm("-f", name)
-		err = dockercli.RunContainer(cli,
-			"--name", name,
-			"--rm",
-			"-e", "ETCD_PORT="+etcdPort,
-			"-e", "HOST="+ipaddr,
-			"--net=host",
-			cephImage)
-	}()
-	dockercli.PrintToStdout(t, stdout, stdoutPipe, "mds.0.1 active_start")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// RunMockCephGateway starts a mock S3 endpoint used for component testing
-func RunMockCephGateway(t *testing.T, name string, port string, etcdPort string) {
-	var err error
-	cli, stdout, stdoutPipe := dockercli.NewClient()
-	cephImage := "deis/store-gateway:" + utils.BuildTag()
-	ipaddr := utils.HostAddress()
-	cephAddr := ipaddr + ":" + port
-	fmt.Printf("--- Running deis/mock-ceph-gateway at %s\n", cephAddr)
-	done2 := make(chan bool, 1)
-	go func() {
-		done2 <- true
-		_ = cli.CmdRm("-f", name)
-		err = dockercli.RunContainer(cli,
-			"--name", name,
-			"-h", "deis-store-gateway",
-			"--rm",
-			"-p", port+":"+"8888",
-			"-e", "ETCD_PORT="+etcdPort,
-			"-e", "HOST="+ipaddr,
-			"-e", "EXTERNAL_PORT="+port,
-			cephImage)
-	}()
 	dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-store-gateway running...")
 	if err != nil {
 		t.Fatal(err)