Skip to content

Commit

Permalink
Adding more go version to the matrix and allow failures for go tip an…
Browse files Browse the repository at this point in the history
…d 3.5 zk

test output to nil like before
  • Loading branch information
jeffbean authored and nemith committed Jul 27, 2019
1 parent 845d93d commit adec172
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: go
go:
- 1.11
- 1.9
- tip

go_import_path: github.com/samuel/go-zookeeper

Expand All @@ -26,6 +28,12 @@ script:
- go build ./...
- make test

matrix:
allow_failures:
- go: tip
- env: zk_version=3.5.4-beta
fast_finish: true

env:
global:
secure: Coha3DDcXmsekrHCZlKvRAc+pMBaQU1QS/3++3YCCUXVDBWgVsC1ZIc9df4RLdZ/ncGd86eoRq/S+zyn1XbnqK5+ePqwJoUnJ59BE8ZyHLWI9ajVn3fND1MTduu/ksGsS79+IYbdVI5wgjSgjD3Ktp6Y5uPl+BPosjYBGdNcHS4=
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ travis: $(ZK) install-test-deps

.PHONY: test
test:
go test -timeout 120s -v ./...
go test -timeout 300s -v -i -race ./...
go test -timeout 300s -v -race -covermode atomic -coverprofile=profile.cov ./zk
go test -timeout 300s -v ./...
go test -timeout 400s -v -i -race ./...
go test -timeout 400s -v -race -covermode atomic -coverprofile=profile.cov ./zk
# ignore if we fail to publish coverage
-goveralls -coverprofile=profile.cov -service=travis-ci
3 changes: 1 addition & 2 deletions cluster_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package zk

import (
"os"
"sync"
"testing"
"time"
Expand All @@ -18,7 +17,7 @@ func (lw logWriter) Write(b []byte) (int, error) {
}

func TestBasicCluster(t *testing.T) {
ts, err := StartTestCluster(t, 3, os.Stdout, logWriter{t: t, p: "[ZKERR] "})
ts, err := StartTestCluster(t, 3, nil, logWriter{t: t, p: "[ZKERR] "})
if err != nil {
t.Fatal(err)
}
Expand Down
3 changes: 1 addition & 2 deletions server_java.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@ func New3dot4TestServer(t *testing.T, configPath string, stdout, stderr io.Write
}

func New3dot5TestServer(t *testing.T, configPath string, stdout, stderr io.Writer) (*server, error) {
// if os.Stat("../zookeeper-3.5.4-beta/bin/zkServer.sh")
zkPath := os.Getenv("ZOOKEEPER_BIN_PATH")
if zkPath == "" {
// default to a static path that can be setup with a build system
// default to a static reletive path that can be setup with a build system
zkPath = "../zookeeper/bin"
}
if _, err := os.Stat(zkPath); err != nil {
Expand Down

0 comments on commit adec172

Please sign in to comment.