Exit on errors

2 files changed, 9 insertions, 1 deletions

diff --git a/client/go/cmd/command_tester.go b/client/go/cmd/command_tester.go
index f40594c288e..8a6e4fd9921 100644
--- a/client/go/cmd/command_tester.go
+++ b/client/go/cmd/command_tester.go
@@ -55,13 +55,16 @@ func execute(cmd command, t *testing.T, client *mockHttpClient) string {
 		}
 	})
 
+	// Do not exit in tests
+	exitFunc = func(code int) {}
+
 	// Capture stdout and execute command
 	var b bytes.Buffer
 	log.SetOutput(&b)
 	rootCmd.SetArgs(append(cmd.args, cmd.moreArgs...))
 	rootCmd.Execute()
 	out, err := ioutil.ReadAll(&b)
-	assert.Empty(t, err, "No error")
+	assert.Nil(t, err, "No error")
 	return string(out)
 }
 
diff --git a/client/go/cmd/print.go b/client/go/cmd/print.go
index b6394dbe340..12e28c70e5f 100644
--- a/client/go/cmd/print.go
+++ b/client/go/cmd/print.go
@@ -5,13 +5,17 @@ package cmd
 import (
 	"fmt"
 	"log"
+	"os"
 )
 
+var exitFunc = os.Exit // To allow overriding Exit in tests
+
 func printErrHint(err error, hints ...string) {
 	printErr(nil, err.Error())
 	for _, hint := range hints {
 		log.Print(color.Cyan("Hint: "), hint)
 	}
+	exitFunc(1)
 }
 
 func printErr(err error, msg ...interface{}) {
@@ -21,6 +25,7 @@ func printErr(err error, msg ...interface{}) {
 	if err != nil {
 		log.Print(color.Yellow(err))
 	}
+	exitFunc(1)
 }
 
 func printSuccess(msg ...interface{}) {