Merge pull request #14 from uber/typo

tcheck.go

@@ -39,10 +39,10 @@ import (
 const (
 	_serviceName = "tcheck"
 
-	_exitUnknown          = 1
-	_exitUsage            = 2
-	_exitUnknownUnhealthy = 3
-	_exitExplitiUnhealthy = 4
+	_exitUnknown           = 1
+	_exitUsage             = 2
+	_exitUnknownUnhealthy  = 3
+	_exitExplicitUnhealthy = 4
 )
 
 var _osExit = os.Exit
@@ -109,7 +109,7 @@ func healthCheck(peer, serviceName string, timeout time.Duration) error {
 		return exitError{_exitUnknownUnhealthy, fmt.Sprintf("NOT OK %v\nError: %v\n", serviceName, err)}
 	}
 	if val.Ok != true {
-		return exitError{_exitExplitiUnhealthy, fmt.Sprintf("NOT OK %v\n", *val.Message)}
+		return exitError{_exitExplicitUnhealthy, fmt.Sprintf("NOT OK %v\n", val.GetMessage())}
 	}
 
 	return nil

tcheck_test.go

@@ -28,12 +28,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/uber/tchannel-go"
-	"github.com/uber/tchannel-go/testutils"
-	"github.com/uber/tchannel-go/thrift"
+	"github.com/uber/tcheck/internal/gen-go/meta"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/uber/tchannel-go"
+	"github.com/uber/tchannel-go/testutils"
+	"github.com/uber/tchannel-go/thrift"
 )
 
 func healthNotOk(ctx thrift.Context) (ok bool, message string) {
@@ -150,7 +151,7 @@ func TestHealthCheckBadArgs(t *testing.T) {
 			msg:      "unhealthy health handler",
 			peer:     unhealthyHandler.PeerInfo().HostPort,
 			svc:      "svc",
-			wantExit: _exitExplitiUnhealthy,
+			wantExit: _exitExplicitUnhealthy,
 			wantErr:  "test-error",
 		},
 		{
@@ -193,6 +194,29 @@ func TestIntegrationSuccess(t *testing.T) {
 	main()
 }
 
+type unhealthyHandler struct {
+	// Embed interface so unimplemented methods cause panic.
+	meta.TChanMeta
+}
+
+func (unhealthyHandler) Health(_ thrift.Context) (*meta.HealthStatus, error) {
+	return &meta.HealthStatus{
+		Ok: false,
+	}, nil
+}
+
+func TestIntegrationNotOKNoMessage(t *testing.T) {
+	server := setupServer(t, nil)
+	defer server.Close()
+
+	tServer := thrift.NewServer(server)
+	tServer.Register(meta.NewTChanMetaServer(unhealthyHandler{}))
+
+	err := healthCheck(server.PeerInfo().HostPort, server.ServiceName(), time.Second)
+	require.Error(t, err, "Expected health check to fail")
+	assert.Equal(t, _exitExplicitUnhealthy, getExitCode(err), "Unexpected exit code")
+}
+
 func TestIntegrationError(t *testing.T) {
 	defer func() { _osExit = os.Exit }()