Merge branch '18995-code-cleanup-1'

[arvados.git] / lib / cmd / cmd_test.go

diff --git a/lib/cmd/cmd_test.go b/lib/cmd/cmd_test.go
index 04e98d85c3ec41b08235e6e70dd3bb29337638a4..2d03722adcc5a31fe1d535c1d213dcdc8e82e14d 100644 (file)
--- a/lib/cmd/cmd_test.go
+++ b/lib/cmd/cmd_test.go
@@ -12,7 +12,7 @@ import (
        "strings"
        "testing"
 
-       "git.curoverse.com/arvados.git/lib/cmdtest"
+       "git.arvados.org/arvados.git/lib/cmdtest"
        check "gopkg.in/check.v1"
 )
 
@@ -25,18 +25,28 @@ var _ = check.Suite(&CmdSuite{})
 
 type CmdSuite struct{}
 
-var testCmd = Multi(map[string]RunFunc{
-       "echo": func(prog string, args []string, stdin io.Reader, stdout io.Writer, stderr io.Writer) int {
+var testCmd = Multi(map[string]Handler{
+       "echo": HandlerFunc(func(prog string, args []string, stdin io.Reader, stdout io.Writer, stderr io.Writer) int {
                fmt.Fprintln(stdout, strings.Join(args, " "))
                return 0
-       },
+       }),
 })
 
 func (s *CmdSuite) TestHello(c *check.C) {
        defer cmdtest.LeakCheck(c)()
        stdout := bytes.NewBuffer(nil)
        stderr := bytes.NewBuffer(nil)
-       exited := testCmd("prog", []string{"echo", "hello", "world"}, bytes.NewReader(nil), stdout, stderr)
+       exited := testCmd.RunCommand("prog", []string{"echo", "hello", "world"}, bytes.NewReader(nil), stdout, stderr)
+       c.Check(exited, check.Equals, 0)
+       c.Check(stdout.String(), check.Equals, "hello world\n")
+       c.Check(stderr.String(), check.Equals, "")
+}
+
+func (s *CmdSuite) TestHelloViaProg(c *check.C) {
+       defer cmdtest.LeakCheck(c)()
+       stdout := bytes.NewBuffer(nil)
+       stderr := bytes.NewBuffer(nil)
+       exited := testCmd.RunCommand("/usr/local/bin/echo", []string{"hello", "world"}, bytes.NewReader(nil), stdout, stderr)
        c.Check(exited, check.Equals, 0)
        c.Check(stdout.String(), check.Equals, "hello world\n")
        c.Check(stderr.String(), check.Equals, "")
@@ -46,10 +56,10 @@ func (s *CmdSuite) TestUsage(c *check.C) {
        defer cmdtest.LeakCheck(c)()
        stdout := bytes.NewBuffer(nil)
        stderr := bytes.NewBuffer(nil)
-       exited := testCmd("prog", []string{"nosuchcommand", "hi"}, bytes.NewReader(nil), stdout, stderr)
+       exited := testCmd.RunCommand("prog", []string{"nosuchcommand", "hi"}, bytes.NewReader(nil), stdout, stderr)
        c.Check(exited, check.Equals, 2)
        c.Check(stdout.String(), check.Equals, "")
-       c.Check(stderr.String(), check.Matches, `(?ms)^unrecognized command "nosuchcommand"\n.*echo.*\n`)
+       c.Check(stderr.String(), check.Matches, `(?ms)^prog: unrecognized command "nosuchcommand"\n.*echo.*\n`)
 }
 
 func (s *CmdSuite) TestSubcommandToFront(c *check.C) {