X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9c4901c09e0395899b268f9a734514ae7be4f9c9..b5758f0bfb2d28a0916f8f567da69550bcae656e:/cmd/arvados-client/cmd_test.go

diff --git a/cmd/arvados-client/cmd_test.go b/cmd/arvados-client/cmd_test.go
index b1ab5badfa..911375c655 100644
--- a/cmd/arvados-client/cmd_test.go
+++ b/cmd/arvados-client/cmd_test.go
@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"git.arvados.org/arvados.git/lib/cmd"
 	check "gopkg.in/check.v1"
 )
 
@@ -22,19 +23,19 @@ var _ = check.Suite(&ClientSuite{})
 type ClientSuite struct{}
 
 func (s *ClientSuite) TestBadCommand(c *check.C) {
-	exited := Run("arvados-client", []string{"no such command"}, bytes.NewReader(nil), ioutil.Discard, ioutil.Discard)
-	c.Check(exited, check.Equals, 2)
+	exited := handler.RunCommand("arvados-client", []string{"no such command"}, bytes.NewReader(nil), ioutil.Discard, ioutil.Discard)
+	c.Check(exited, check.Equals, cmd.EXIT_INVALIDARGUMENT)
 }
 
 func (s *ClientSuite) TestBadSubcommandArgs(c *check.C) {
-	exited := Run("arvados-client", []string{"get"}, bytes.NewReader(nil), ioutil.Discard, ioutil.Discard)
-	c.Check(exited, check.Equals, 2)
+	exited := handler.RunCommand("arvados-client", []string{"get"}, bytes.NewReader(nil), ioutil.Discard, ioutil.Discard)
+	c.Check(exited, check.Equals, cmd.EXIT_INVALIDARGUMENT)
 }
 
 func (s *ClientSuite) TestVersion(c *check.C) {
 	stdout := bytes.NewBuffer(nil)
 	stderr := bytes.NewBuffer(nil)
-	exited := Run("arvados-client", []string{"version"}, bytes.NewReader(nil), stdout, stderr)
+	exited := handler.RunCommand("arvados-client", []string{"version"}, bytes.NewReader(nil), stdout, stderr)
 	c.Check(exited, check.Equals, 0)
 	c.Check(stdout.String(), check.Matches, `arvados-client dev \(go[0-9\.]+\)\n`)
 	c.Check(stderr.String(), check.Equals, "")