Various improvements to unit tests.

Gopkg.toml

@@ -31,7 +31,8 @@
 
 [[constraint]]
   name = "github.com/weaveworks/common"
-  branch = "master"
+  source = "https://github.com/tomwilkie/weaveworks-common"
+  branch = "server-listen-addr"
 
 [[constraint]]
   name = "gopkg.in/fsnotify.v1"

pkg/ingester/flush_test.go

@@ -2,17 +2,14 @@ package ingester
 
 import (
 	"fmt"
-	"os"
 	"sort"
 	"sync"
 	"testing"
 	"time"
 
 	"github.com/cortexproject/cortex/pkg/chunk"
 	"github.com/cortexproject/cortex/pkg/ring"
-	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/flagext"
-	"github.com/go-kit/kit/log"
 	"github.com/grafana/loki/pkg/chunkenc"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/prometheus/common/model"
@@ -27,7 +24,7 @@ const (
 )
 
 func init() {
-	util.Logger = log.NewLogfmtLogger(os.Stdout)
+	//util.Logger = log.NewLogfmtLogger(os.Stdout)
 }
 
 func TestChunkFlushingIdle(t *testing.T) {
@@ -81,6 +78,7 @@ func defaultIngesterTestConfig() Config {
 	cfg.LifecyclerConfig.ListenPort = func(i int) *int { return &i }(0)
 	cfg.LifecyclerConfig.Addr = "localhost"
 	cfg.LifecyclerConfig.ID = "localhost"
+	cfg.LifecyclerConfig.FinalSleep = 0
 	return cfg
 }
 

pkg/ingester/ingester_test.go

@@ -13,19 +13,10 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/cortexproject/cortex/pkg/chunk"
-	"github.com/cortexproject/cortex/pkg/ring"
-	"github.com/cortexproject/cortex/pkg/util/flagext"
 )
 
 func TestIngester(t *testing.T) {
-	var ingesterConfig Config
-	flagext.DefaultValues(&ingesterConfig)
-	ingesterConfig.LifecyclerConfig.RingConfig.Mock = ring.NewInMemoryKVClient()
-	ingesterConfig.LifecyclerConfig.NumTokens = 1
-	ingesterConfig.LifecyclerConfig.ListenPort = func(i int) *int { return &i }(0)
-	ingesterConfig.LifecyclerConfig.Addr = "localhost"
-	ingesterConfig.LifecyclerConfig.ID = "localhost"
-
+	ingesterConfig := defaultIngesterTestConfig()
 	store := &mockStore{
 		chunks: map[string][]chunk.Chunk{},
 	}

pkg/promtail/promtail_test.go

@@ -31,10 +31,11 @@ import (
 	"github.com/grafana/loki/pkg/promtail/scrape"
 )
 
+const httpTestPort = 9080
+
 func TestPromtail(t *testing.T) {
 
 	// Setup.
-
 	w := log.NewSyncWriter(os.Stderr)
 	logger := log.NewLogfmtLogger(w)
 	logger = level.NewFilter(logger, level.AllowInfo())
@@ -71,7 +72,7 @@ func TestPromtail(t *testing.T) {
 		}
 	}()
 	go func() {
-		if err = http.ListenAndServe("127.0.0.1:3100", nil); err != nil {
+		if err = http.ListenAndServe("localhost:3100", nil); err != nil {
 			err = errors.Wrap(err, "Failed to start web server to receive logs")
 		}
 	}()
@@ -398,7 +399,7 @@ func (h *testServerHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func getPromMetrics(t *testing.T) ([]byte, string) {
-	resp, err := http.Get("http://localhost:80/metrics")
+	resp, err := http.Get(fmt.Sprintf("http://localhost:%d/metrics", httpTestPort))
 	if err != nil {
 		t.Fatal("Could not query metrics endpoint", err)
 	}
@@ -457,6 +458,11 @@ func buildTestConfig(t *testing.T, positionsFileName string, logDirName string)
 	// Init everything with default values.
 	flagext.RegisterFlags(&cfg)
 
+	// Make promtail listen on localhost to avoid prompts on MacOS.
+	cfg.ServerConfig.HTTPListenHost = "localhost"
+	cfg.ServerConfig.HTTPListenPort = httpTestPort
+	cfg.ServerConfig.GRPCListenHost = "localhost"
+
 	// Override some of those defaults
 	cfg.ClientConfig.URL = clientURL
 	cfg.ClientConfig.BatchWait = 10 * time.Millisecond