scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

better use of docker-compose opts per code review

Browse source
This commit is contained in:
Matt Jaffee 2018-11-12 17:44:23 -06:00
parent 90c5f64b19
commit 37ac8b7a93
No known key found for this signature in database
GPG key ID: 08A3DFFF987B11BF
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -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

9
internal/clustertests/cluster_test.go
View file

@ -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