Add tests for host runner

cmoog · cmoog · commit f4fe567b28e0 · 2020-07-28T18:01:15.000-05:00
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -91,6 +91,28 @@ func TestTCli(t *testing.T) {
 	)
 }
 
+func TestHostRunner(t *testing.T) {
+	var (
+		c   tcli.HostRunner
+		ctx = context.Background()
+	)
+
+	c.Run(ctx, "echo testing").Assert(t,
+		tcli.Success(),
+		tcli.StderrEmpty(),
+		tcli.StdoutMatches("testing"),
+	)
+
+	wd, err := os.Getwd()
+	assert.Success(t, "get working dir", err)
+
+	c.Run(ctx, "pwd").Assert(t,
+		tcli.Success(),
+		tcli.StderrEmpty(),
+		tcli.StdoutMatches(wd),
+	)
+}
+
 func TestCoderCLI(t *testing.T) {
 	ctx := context.Background()
 
diff --git a/ci/tcli/tcli.go b/ci/tcli/tcli.go
@@ -100,8 +100,10 @@ func (r *ContainerRunner) Close() error {
 	return nil
 }
 
+// HostRunner executes command tests on the host, outside of a container
 type HostRunner struct{}
 
+// Run executes the given command on the host
 func (r *HostRunner) Run(ctx context.Context, command string) *Assertable {
 	var (
 		args  []string
@@ -114,19 +116,23 @@ func (r *HostRunner) Run(ctx context.Context, command string) *Assertable {
 	if len(parts) > 1 {
 		args = parts[1:]
 	}
+	cmd := exec.CommandContext(ctx, path, args...)
+
 	return &Assertable{
-		cmd:   exec.CommandContext(ctx, path, args...),
+		cmd:   cmd,
 		tname: command,
 	}
 }
 
+// RunCmd executes the given command on the host
 func (r *HostRunner) RunCmd(cmd *exec.Cmd) *Assertable {
 	return &Assertable{
 		cmd:   cmd,
 		tname: strings.Join(cmd.Args, " "),
 	}
 }
 
+// Close is a noop for HostRunner
 func (r *HostRunner) Close() error {
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,10 @@ func (r *ContainerRunner) Close() error {`
`100`	`100`	`return nil`
`101`	`101`	`}`
`102`	`102`
	`103`	`+// HostRunner executes command tests on the host, outside of a container`
`103`	`104`	`type HostRunner struct{}`
`104`	`105`
	`106`	`+// Run executes the given command on the host`
`105`	`107`	`func (r HostRunner) Run(ctx context.Context, command string) Assertable {`
`106`	`108`	`var (`
`107`	`109`	`args []string`
`@@ -114,19 +116,23 @@ func (r HostRunner) Run(ctx context.Context, command string) Assertable {`
`114`	`116`	`if len(parts) > 1 {`
`115`	`117`	`args = parts[1:]`
`116`	`118`	`}`
	`119`	`+ cmd := exec.CommandContext(ctx, path, args...)`
	`120`	`+`
`117`	`121`	`return &Assertable{`
`118`		`- cmd: exec.CommandContext(ctx, path, args...),`
	`122`	`+ cmd: cmd,`
`119`	`123`	`tname: command,`
`120`	`124`	`}`
`121`	`125`	`}`
`122`	`126`
	`127`	`+// RunCmd executes the given command on the host`
`123`	`128`	`func (r HostRunner) RunCmd(cmd exec.Cmd) *Assertable {`
`124`	`129`	`return &Assertable{`
`125`	`130`	`cmd: cmd,`
`126`	`131`	`tname: strings.Join(cmd.Args, " "),`
`127`	`132`	`}`
`128`	`133`	`}`
`129`	`134`
	`135`	`+// Close is a noop for HostRunner`
`130`	`136`	`func (r *HostRunner) Close() error {`
`131`	`137`	`return nil`
`132`	`138`	`}`