diff --git a/.travis.yml b/.travis.yml index b91e036..dfd40b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ before_install: - dep ensure script: - ./pilosa-master-linux-amd64/pilosa server --metric.diagnostics=false -b https://:20101 -d https_data --tls.skip-verify --tls.certificate test.pilosa.local.crt --tls.key test.pilosa.local.key --cluster.disabled static & - - PILOSA_BIND="https://:20101" make test-all-race + - PILOSA_BIND="https://:20101" make test-all-race TESTFLAGS=-v - pkill pilosa - ./pilosa-master-linux-amd64/pilosa server --metric.diagnostics=false -d http_data & - - GOARCH=386 make test-all + - GOARCH=386 make test-all TESTFLAGS=-v - $HOME/gopath/bin/goveralls -service=travis-ci -ignore "gopilosa_pbuf/public.pb.go" -flags="-tags=integration fullcoverage" diff --git a/Makefile b/Makefile index af2cf55..cc9844c 100644 --- a/Makefile +++ b/Makefile @@ -6,22 +6,22 @@ VERSION := $(shell git describe --tags 2> /dev/null || echo unknown) all: test cover: - go test -cover -tags="integration fullcoverage" + go test -cover -tags="integration fullcoverage" $(TESTFLAGS) fast-cover: - go test -cover -tags="integration" + go test -cover -tags="integration" $(TESTFLAGS) generate: protoc --go_out=. gopilosa_pbuf/public.proto test: - go test + go test $(TESTFLAGS) test-all: - go test -tags=integration + go test -tags=integration $(TESTFLAGS) test-all-race: - go test -race -tags=integration + go test -race -tags=integration $(TESTFLAGS) release: printf "package pilosa\nconst Version = \"$(VERSION)\"" > version.go diff --git a/orm_test.go b/orm_test.go index faf8d65..a5079f1 100644 --- a/orm_test.go +++ b/orm_test.go @@ -370,6 +370,9 @@ func TestTopN(t *testing.T) { comparePQL(t, "TopN(Bitmap(row=7, frame='collaboration'), frame='sample-frame', n=12, field='category', filters=[80,81])", sampleFrame.FilterFieldTopN(12, collabFrame.Bitmap(7), "category", 80, 81)) + comparePQL(t, + "TopN(frame='sample-frame', n=12, field='category', filters=[80,81])", + sampleFrame.FilterFieldTopN(12, nil, "category", 80, 81)) } func TestFieldLT(t *testing.T) {