From 37ac8b7a93adea7325c6b728bd7e315f9d0253f6 Mon Sep 17 00:00:00 2001
From: Matt Jaffee <matthew.jaffee@gmail.com>
Date: Mon, 12 Nov 2018 17:44:23 -0600
Subject: [PATCH] better use of docker-compose opts per code review

---
 Makefile                              | 11 +++++------
 internal/clustertests/cluster_test.go |  9 ---------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 9cf4cffaf..34f97965e 100644
--- a/Makefile
+++ b/Makefile
@@ -73,16 +73,15 @@ release: check-clean
 # make changes to Pilosa, you'll want to run clustertests-build to rebuild the
 # pilosa image.
 clustertests:
-	cd internal/clustertests;\
-	docker-compose down;\
-	docker-compose up;
+	docker-compose -f internal/clustertests/docker-compose.yml down
+	docker-compose -f internal/clustertests/docker-compose.yml build client1
+	docker-compose -f internal/clustertests/docker-compose.yml up --exit-code-from=client1
 
 
 # Like clustertests, but rebuilds all images.
 clustertests-build:
-	cd internal/clustertests;\
-	docker-compose down;\
-	docker-compose up --build;
+	docker-compose -f internal/clustertests/docker-compose.yml down
+	docker-compose -f internal/clustertests/docker-compose.yml up --exit-code-from=client1 --build
 
 # Create prerelease builds
 prerelease: vendor
diff --git a/internal/clustertests/cluster_test.go b/internal/clustertests/cluster_test.go
index 7ced51042..402a8c14c 100644
--- a/internal/clustertests/cluster_test.go
+++ b/internal/clustertests/cluster_test.go
@@ -18,7 +18,6 @@ func TestClusterStuff(t *testing.T) {
 	cli := getPilosaClient(t)
 
 	t.Run("long pause", func(t *testing.T) {
-
 		idx := pilosa.NewIndex("testidx")
 		err := cli.CreateIndex(idx)
 		if err != nil {
@@ -72,16 +71,8 @@ func TestClusterStuff(t *testing.T) {
 		} else if r.Result().Count() != 1000 {
 			t.Fatalf("count after import is %d", r.Result().Count())
 		}
-
 	})
 
-	down := exec.Command("/pumba", "stop", "clustertests_pilosa3_1", "clustertests_pilosa2_1", "clustertests_pilosa1_1")
-	down.Stdout = os.Stdout
-	down.Stderr = os.Stderr
-	err := down.Run()
-	if err != nil {
-		t.Logf("stopping Pilosa: %v", err)
-	}
 }
 
 // Utils