fixes

Signed-off-by: Derek Collison <derek@nats.io>

.travis.yml

@@ -17,7 +17,7 @@ before_script:
 - megacheck $EXCLUDE_VENDOR
 - if [[ "$TRAVIS_GO_VERSION" == 1.10.* ]]; then ./scripts/cross_compile.sh $TRAVIS_TAG; fi
 script:
-- go test -i -race $EXCLUDE_VENDOR
+- go test -i $EXCLUDE_VENDOR
 - if [[ "$TRAVIS_GO_VERSION" == 1.10.* ]]; then ./scripts/cov.sh TRAVIS; else go test -v -race $EXCLUDE_VENDOR; fi
 after_success:
 - if [[ "$TRAVIS_GO_VERSION" == 1.10.* ]] && [ "$TRAVIS_TAG" != "" ]; then ghr --owner nats-io --token $GITHUB_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi

server/norace_test.go

@@ -47,7 +47,7 @@ func TestAvoidSlowConsumerBigMessages(t *testing.T) {
 	data := make([]byte, 1024*1024) // 1MB payload
 	rand.Read(data)
 
-	expected := int32(1000)
+	expected := int32(500)
 	received := int32(0)
 
 	done := make(chan bool)
@@ -67,7 +67,7 @@ func TestAvoidSlowConsumerBigMessages(t *testing.T) {
 		t.Fatalf("Received an error on the subscription's connection: %v\n", err)
 	})
 
-	for i := int32(0); i < expected; i++ {
+	for i := 0; i < int(expected); i++ {
 		nc2.Publish("slow.consumer", data)
 	}
 	nc2.Flush()

server/reload_test.go

@@ -606,21 +606,18 @@ func TestConfigReloadRotateTokenAuthentication(t *testing.T) {
 	defer os.Remove(config)
 	defer server.Shutdown()
 
+	disconnected := make(chan struct{})
+	asyncErr := make(chan error)
+	eh := func(nc *nats.Conn, sub *nats.Subscription, err error) { asyncErr <- err }
+	dh := func(*nats.Conn) { disconnected <- struct{}{} }
+
 	// Ensure we can connect as a sanity check.
 	addr := fmt.Sprintf("nats://%s:%d", opts.Host, opts.Port)
-	nc, err := nats.Connect(addr, nats.Token("T0pS3cr3t"))
+	nc, err := nats.Connect(addr, nats.Token("T0pS3cr3t"), nats.ErrorHandler(eh), nats.DisconnectHandler(dh))
 	if err != nil {
 		t.Fatalf("Error creating client: %v", err)
 	}
 	defer nc.Close()
-	disconnected := make(chan struct{})
-	asyncErr := make(chan error)
-	nc.SetErrorHandler(func(nc *nats.Conn, sub *nats.Subscription, err error) {
-		asyncErr <- err
-	})
-	nc.SetDisconnectHandler(func(*nats.Conn) {
-		disconnected <- struct{}{}
-	})
 
 	// Change authentication token.
 	createSymlink(t, config, "./configs/reload/token_authentication_2.conf")