18874: Add workbench2 to package-building scripts.

[arvados.git] / cmd / arvados-client / cmd_test.go

diff --git a/cmd/arvados-client/cmd_test.go b/cmd/arvados-client/cmd_test.go
index b1ab5badfa86260da1cbd8d6668901952b0fc2b7..911375c655e0d295957903793a9b98f4943d4d8c 100644 (file)
--- 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, "")