Merge pull request #1156 from grafana/shield-long-tests-and-bench

clean way of skipping expensive and integration tests. fix #1155
grafana · Nov 29, 2018 · 9e5eff6 · 9e5eff6
2 parents 9bc5f2c + 4a3ff62
commit 9e5eff6
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,9 @@
 default:
 	$(MAKE) all
 test:
-	CGO_ENABLED=1 go test -race $(shell go list ./... | grep -v stacktest)
+	CGO_ENABLED=1 go test -race -short ./...
+test-all:
+	CGO_ENABLED=1 go test -race ./...
 check:
 	$(MAKE) test
 bin:

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -10,7 +10,8 @@ Thanks for your interest in contributing to metrictank!
 
 * `make bin`: for building all binaries.
 * `make docker`: for building docker image (after building binaries)
-* `make test`: unit tests
+* `make test`: unit tests excluding expensive integration tests (faster)
+* `make test-all`: unit tests including expensive integration tests (slower)
 * `make qa`: run all QA (code quality) tests, same as CirceCI qa checks except CI also runs stack tests.
 
 see the [Makefile](../Makefile) for more targets

diff --git a/idx/cassandra/cassandra_test.go b/idx/cassandra/cassandra_test.go
@@ -419,6 +419,9 @@ func TestFind(t *testing.T) {
 }
 
 func BenchmarkIndexing(b *testing.B) {
+	if testing.Short() {
+		b.Skip("skipping " + b.Name() + " in short mode")
+	}
 	cluster.Manager.SetPartitions([]int32{1})
 	keyspace = "metrictank"
 	hosts = "localhost:9042"
@@ -467,6 +470,9 @@ func insertDefs(ix idx.MetricIndex, i int) {
 }
 
 func BenchmarkLoad(b *testing.B) {
+	if testing.Short() {
+		b.Skip("skipping " + b.Name() + " in short mode")
+	}
 	cluster.Manager.SetPartitions([]int32{1})
 	keyspace = "metrictank"
 	hosts = "localhost:9042"
@@ -500,6 +506,9 @@ func BenchmarkLoad(b *testing.B) {
 }
 
 func BenchmarkIndexingWithUpdates(b *testing.B) {
+	if testing.Short() {
+		b.Skip("skipping " + b.Name() + " in short mode")
+	}
 	cluster.Manager.SetPartitions([]int32{1})
 	keyspace = "metrictank"
 	hosts = "localhost:9042"

diff --git a/stacktest/tests/chaos_cluster/chaos_cluster_test.go b/stacktest/tests/chaos_cluster/chaos_cluster_test.go
@@ -2,6 +2,7 @@ package chaos_cluster
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"os"
 	"os/exec"
@@ -33,6 +34,11 @@ func init() {
 	log.SetLevel(log.InfoLevel)
 }
 func TestMain(m *testing.M) {
+	flag.Parse()
+	if testing.Short() {
+		fmt.Println("skipping chaos cluster test in short mode")
+		return
+	}
 	ctx, cancelFunc := context.WithCancel(context.Background())
 
 	fmt.Println("stopping docker-chaos stack should it be running...")

diff --git a/stacktest/tests/end2end_carbon/end2end_carbon_test.go b/stacktest/tests/end2end_carbon/end2end_carbon_test.go
@@ -1,6 +1,8 @@
 package end2end_carbon
 
 import (
+	"flag"
+	"fmt"
 	"os"
 	"os/exec"
 	"syscall"
@@ -31,6 +33,11 @@ func init() {
 	log.SetLevel(log.InfoLevel)
 }
 func TestMain(m *testing.M) {
+	flag.Parse()
+	if testing.Short() {
+		fmt.Println("skipping end2end carbon test (cassandra) in short mode")
+		return
+	}
 	log.Println("launching docker-dev stack...")
 	version := exec.Command("docker-compose", "version")
 	output, err := version.CombinedOutput()

diff --git a/stacktest/tests/end2end_carbon_bigtable/end2end_carbon_test.go b/stacktest/tests/end2end_carbon_bigtable/end2end_carbon_test.go
@@ -1,6 +1,8 @@
 package end2end_carbon_bigtable
 
 import (
+	"flag"
+	"fmt"
 	"os"
 	"os/exec"
 	"syscall"
@@ -31,6 +33,11 @@ func init() {
 	log.SetLevel(log.InfoLevel)
 }
 func TestMain(m *testing.M) {
+	flag.Parse()
+	if testing.Short() {
+		fmt.Println("skipping end2end carbon test (bigtable) in short mode")
+		return
+	}
 	log.Println("launching docker-dev-bigtable stack...")
 	version := exec.Command("docker-compose", "version")
 	output, err := version.CombinedOutput()