From 0475d176f2e7306c25c0b944e563b12b658d67fa Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Mon, 23 Feb 2015 19:17:56 -0800 Subject: [PATCH] Wildcard unit test should expect "series" not "rows" --- server_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server_test.go b/server_test.go index d129cf969c..4802ea8aeb 100644 --- a/server_test.go +++ b/server_test.go @@ -1051,7 +1051,7 @@ func TestServer_ExecuteWildcardGroupBy(t *testing.T) { results := s.ExecuteQuery(MustParseQuery(`SELECT mean(value) FROM cpu GROUP BY *`), "foo", nil) if res := results.Results[0]; res.Err != nil { t.Fatalf("unexpected error during GROUP BY *: %s", res.Err) - } else if s := mustMarshalJSON(res); s != `{"rows":[{"name":"cpu","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",15]]},{"name":"cpu","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",30]]}]}` { + } else if s := mustMarshalJSON(res); s != `{"series":[{"name":"cpu","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",15]]},{"name":"cpu","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",30]]}]}` { t.Fatalf("unexpected results during SELECT *: %s", s) } @@ -1059,7 +1059,7 @@ func TestServer_ExecuteWildcardGroupBy(t *testing.T) { results = s.ExecuteQuery(MustParseQuery(`SELECT mean(value) FROM cpu GROUP BY *,time(1m)`), "foo", nil) if res := results.Results[0]; res.Err != nil { t.Fatalf("unexpected error during GROUP BY *: %s", res.Err) - } else if s := mustMarshalJSON(res); s != `{"rows":[{"name":"cpu","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",15]]},{"name":"cpu","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",30]]}]}` { + } else if s := mustMarshalJSON(res); s != `{"series":[{"name":"cpu","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",15]]},{"name":"cpu","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",30]]}]}` { t.Fatalf("unexpected results during SELECT *: %s", s) } }