.drone.yml

@@ -42,11 +42,13 @@ steps:
       COVERALLS_TOKEN:
         from_secret: coveralls-token
     commands:
+      - 'echo "checking gofmt"'
       - 'echo " ! gofmt -d main.go       2>&1 | read " | bash'
       - 'echo " ! gofmt -d exporter/*.go 2>&1 | read " | bash'
+      - 'echo "checking gofmt - ALL OK"'
       - 'go vet ./exporter/...'
       - 'go build'
-      - "sleep 2"
+      - "sleep 10"   # let redis test instances all come up
       - 'go test -v -covermode=atomic -cover -race -coverprofile=coverage.txt ./exporter/...  --redis.addr=redis'
       - 'go get github.com/mattn/goveralls'
       - '/go/bin/goveralls -coverprofile=coverage.txt -service=drone.io'

exporter/redis_test.go

@@ -383,10 +383,9 @@ func deleteKeysFromDB(t *testing.T, addr string) error {
 	}
 	defer c.Close()
-	_, err = c.Do("SELECT", dbNumStr)
-	if err != nil {
-		t.Errorf("couldn't setup redis, err: %s ", err)
-		return err
+	if _, err = c.Do("SELECT", dbNumStr); err != nil {
+		log.Errorf("couldn't setup redis, err: %s ", err)
+		// not failing on this one - cluster doesn't allow for SELECT so we log and ignore the error
 	}
 	for _, key := range keys {
@@ -1241,6 +1240,10 @@ func TestClusterMaster(t *testing.T) {
 		return
 	}
+	r := prometheus.NewRegistry()
+	prometheus.DefaultGatherer = r
+	prometheus.DefaultRegisterer = r
+
 	ts := httptest.NewServer(promhttp.Handler())
 	defer ts.Close()
@@ -1261,7 +1264,10 @@ func TestClusterMaster(t *testing.T) {
 	body := downloadUrl(t, ts.URL+"/metrics")
 	log.Printf("master - body: %s", body)
-	for _, want := range []string{"test_instance_info", "test_master_repl_offset"} {
+	for _, want := range []string{
+		"test_instance_info{addr=\"redis://redis-cluster:7000\",alias=\"master\",os=\"Linux 4.15.0-20-generic x86_64\",redis_build_id=\"1190d92ebdd7cbcf\",redis_mode=\"cluster\",redis_version=\"5.0.3\",role=\"master\"}",
+		"test_master_repl_offset",
+	} {
 		if !strings.Contains(body, want) {
 			t.Errorf("Did not find key [%s] \nbody: %s", want, body)
 		}
@@ -1318,6 +1324,10 @@ func TestPasswordProtectedInstance(t *testing.T) {
 }
 func TestPasswordInvalid(t *testing.T) {
+	r := prometheus.NewRegistry()
+	prometheus.DefaultGatherer = r
+	prometheus.DefaultRegisterer = r
+
 	ts := httptest.NewServer(promhttp.Handler())
 	defer ts.Close()
@@ -1372,6 +1382,10 @@ func TestClusterSlave(t *testing.T) {
 		return
 	}
+	r := prometheus.NewRegistry()
+	prometheus.DefaultGatherer = r
+	prometheus.DefaultRegisterer = r
+
 	ts := httptest.NewServer(promhttp.Handler())
 	defer ts.Close()
@@ -1392,8 +1406,14 @@ func TestClusterSlave(t *testing.T) {
 	body := downloadUrl(t, ts.URL+"/metrics")
 	log.Printf("slave - body: %s", body)
-	if !strings.Contains(body, "test_instance_info") {
-		t.Errorf("Did not found key %q\n%s", keys[0], body)
+	for _, want := range []string{
+		"test_instance_info",
+		"test_master_last_io_seconds",
+		"test_slave_info{addr=\"redis://redis-cluster:7005\",alias=\"slave\",",
+	} {
+		if !strings.Contains(body, want) {
+			t.Errorf("Did not find key [%s] \nbody: %s", want, body)
+		}
 	}
 }