Merge branch 'master' of https://github.com/influxdb/influxdb into write-series

cmd/influxd/run.go

@@ -98,7 +98,7 @@ func execRun(args []string) {
 					log.Println("failed to start UDP Graphite Server", err.Error())
 				}
 			} else {
-				log.Fatalf("unrecognized Graphite Server prototcol", c.Protocol)
+				log.Fatalf("unrecognized Graphite Server prototcol %s", c.Protocol)
 			}
 		}
 	}

influxql/parser_test.go

@@ -335,8 +335,8 @@ func TestParser_ParseStatement(t *testing.T) {
 		{
 			s: `CREATE USER testuser WITH PASSWORD pwd1337 WITH ALL PRIVILEGES`,
 			stmt: &influxql.CreateUserStatement{
-				Name:     "testuser",
-				Password: "pwd1337",
+				Name:      "testuser",
+				Password:  "pwd1337",
 				Privilege: influxql.NewPrivilege(influxql.AllPrivileges),
 			},
 		},
@@ -840,7 +840,7 @@ func BenchmarkParserParseStatement(b *testing.B) {
 		if stmt, err := influxql.NewParser(strings.NewReader(s)).ParseStatement(); err != nil {
 			b.Fatalf("unexpected error: %s", err)
 		} else if stmt == nil {
-			b.Fatalf("expected statement", stmt)
+			b.Fatalf("expected statement: %s", stmt)
 		}
 	}
 	b.SetBytes(int64(len(s)))

messaging/client_test.go

@@ -17,7 +17,7 @@ func TestClient_ReplicaID(t *testing.T) {
 	c := NewClient(1000)
 	defer c.Close()
 	if replicaID := c.ReplicaID(); replicaID != 1000 {
-		t.Fatalf("unexpected replica id: %s", replicaID)
+		t.Fatalf("unexpected replica id: %d", replicaID)
 	}
 }
 

raft/transport_test.go

@@ -105,7 +105,7 @@ func TestHTTPTransport_Heartbeat_Err(t *testing.T) {
 		u, _ := url.Parse(s.URL)
 		_, _, err := raft.DefaultTransport.Heartbeat(u, 1, 2, 3)
 		if err == nil {
-			t.Errorf("%d. expected error")
+			t.Errorf("%d. expected error", i)
 		} else if tt.err != err.Error() {
 			t.Errorf("%d. error:\n\nexp: %s\n\ngot: %s", i, tt.err, err.Error())
 		}

server_test.go

@@ -575,7 +575,7 @@ func TestServer_Measurements(t *testing.T) {
 	}
 	ids := s.MeasurementSeriesIDs("foo", "foo")
 	if !ids.Equals(expectedSeriesIDs) {
-		t.Fatalf("Series IDs not the same:\n  exp: %s\n  got: %s", expectedSeriesIDs, ids)
+		t.Fatalf("Series IDs not the same:\n  exp: %v\n  got: %v", expectedSeriesIDs, ids)
 	}
 
 	s.Restart()
@@ -586,7 +586,7 @@ func TestServer_Measurements(t *testing.T) {
 	}
 	ids = s.MeasurementSeriesIDs("foo", "foo")
 	if !ids.Equals(expectedSeriesIDs) {
-		t.Fatalf("Series IDs not the same:\n  exp: %s\n  got: %s", expectedSeriesIDs, ids)
+		t.Fatalf("Series IDs not the same:\n  exp: %v\n  got: %v", expectedSeriesIDs, ids)
 	}
 }