omg

.drone.yml

@@ -46,7 +46,7 @@ steps:
       - 'echo " ! gofmt -d exporter/*.go 2>&1 | read " | bash'
       - '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

@@ -1265,7 +1265,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", "test_master_last_io_seconds"} {
+	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)
 		}
@@ -1404,7 +1407,11 @@ func TestClusterSlave(t *testing.T) {
 	body := downloadUrl(t, ts.URL+"/metrics")
 	log.Printf("slave - body: %s", body)
-	for _, want := range []string{"test_instance_info", "test_slave_info"} {
+	for _, want := range []string{
+		"test_instance_info",
+		"test_master_last_io_seconds",
+		"test_slave_info{addr=\"redis://redis-cluster:7005\",alias=\"slave\",master_host=\"172.30.0.4\",master_port=\"7002\",read_only=\"1\"}",
+	} {
 		if !strings.Contains(body, want) {
 			t.Errorf("Did not find key [%s] \nbody: %s", want, body)
 		}