diff --git a/.travis.yml b/.travis.yml index dc9ce618..b0a6ef1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - 1.4.2 - - 1.5 + - 1.5.1 env: - NSQ_DOWNLOAD=nsq-0.3.0.linux-amd64.go1.3.3 GOARCH=amd64 - NSQ_DOWNLOAD=nsq-0.3.0.linux-amd64.go1.3.3 GOARCH=386 @@ -12,7 +12,6 @@ env: - NSQ_DOWNLOAD=nsq-0.3.5.linux-amd64.go1.4.2 GOARCH=amd64 - NSQ_DOWNLOAD=nsq-0.3.5.linux-amd64.go1.4.2 GOARCH=386 install: - - go get github.com/bitly/go-simplejson - go get github.com/mreiferson/go-snappystream script: - wget http://bitly-downloads.s3.amazonaws.com/nsq/$NSQ_DOWNLOAD.tar.gz diff --git a/test.sh b/test.sh index 351135a9..cc9fbbe6 100755 --- a/test.sh +++ b/test.sh @@ -21,13 +21,9 @@ LOOKUPD_PID=$! # run nsqd configured to use our lookupd above rm -f *.dat NSQD_LOGFILE=$(mktemp -t nsqlookupd.XXXXXXX) -EXTRA_ARGS="--tls-root-ca-file=./test/ca.pem" -if [[ $NSQ_DOWNLOAD == nsq-0.2.24* ]] || [[ $NSQ_DOWNLOAD == nsq-0.2.27* ]]; then - EXTRA_ARGS="" -fi -echo "starting nsqd --data-path=/tmp --lookupd-tcp-address=127.0.0.1:4160 --tls-cert=./test/server.pem --tls-key=./test/server.key $EXTRA_ARGS" +echo "starting nsqd --data-path=/tmp --lookupd-tcp-address=127.0.0.1:4160 --tls-cert=./test/server.pem --tls-key=./test/server.key --tls-root-ca-file=./test/ca.pem" echo " logging to $NSQD_LOGFILE" -nsqd --data-path=/tmp --lookupd-tcp-address=127.0.0.1:4160 --tls-cert=./test/server.pem --tls-key=./test/server.key $EXTRA_ARGS >$NSQD_LOGFILE 2>&1 & +nsqd --data-path=/tmp --lookupd-tcp-address=127.0.0.1:4160 --tls-cert=./test/server.pem --tls-key=./test/server.key --tls-root-ca-file=./test/ca.pem >$NSQD_LOGFILE 2>&1 & NSQD_PID=$! sleep 0.3