Add verbose logging to integration tests

cmoog · cmoog · commit e6c79f5ca755 · 2020-07-29T12:35:09.000-05:00
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -23,4 +23,4 @@ jobs:
         with:
           go-version: '^1.14'
       - name: go test
-        run: go test ./ci/integration/...
+        run: go test -v ./ci/integration/...
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -44,6 +44,7 @@ func init() {
 }
 
 func TestTCli(t *testing.T) {
+	t.Parallel()
 	ctx := context.Background()
 
 	container, err := tcli.NewContainerRunner(ctx, &tcli.ContainerConfig{
@@ -92,6 +93,7 @@ func TestTCli(t *testing.T) {
 }
 
 func TestHostRunner(t *testing.T) {
+	t.Parallel()
 	var (
 		c   tcli.HostRunner
 		ctx = context.Background()
@@ -114,6 +116,7 @@ func TestHostRunner(t *testing.T) {
 }
 
 func TestCoderCLI(t *testing.T) {
+	t.Parallel()
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*5)
 	defer cancel()
 
@@ -141,7 +144,11 @@ func TestCoderCLI(t *testing.T) {
 	)
 
 	creds := login(ctx, t)
-	c.Run(ctx, fmt.Sprintf("mkdir -p ~/.config/coder && echo -ne %s > ~/.config/coder/session", creds.token)).Assert(t,
+	cmd := exec.CommandContext(ctx, "mkdir -p ~/.config/coder && cat > ~/.config/coder/session")
+
+	// !IMPORTANT: be careful that this does not appear in logs
+	cmd.Stdin = strings.NewReader(creds.token)
+	c.RunCmd(cmd).Assert(t,
 		tcli.Success(),
 	)
 	c.Run(ctx, fmt.Sprintf("echo -ne %s > ~/.config/coder/url", creds.url)).Assert(t,
diff --git a/ci/tcli/tcli.go b/ci/tcli/tcli.go
@@ -11,6 +11,8 @@ import (
 	"testing"
 	"time"
 
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
 	"cdr.dev/slog/sloggers/slogtest/assert"
 	"golang.org/x/xerrors"
 )
@@ -197,6 +199,14 @@ func (a Assertable) Assert(t *testing.T, option ...Assertion) {
 		cmdResult.Stdout = stdout.Bytes()
 		cmdResult.Stderr = stderr.Bytes()
 
+		slogtest.Info(t, "command output",
+			slog.F("command", a.cmd),
+			slog.F("stdout", string(cmdResult.Stdout)),
+			slog.F("stderr", string(cmdResult.Stderr)),
+			slog.F("exit-code", cmdResult.ExitCode),
+			slog.F("duration", cmdResult.Duration),
+		)
+
 		for ix, o := range option {
 			name := fmt.Sprintf("assertion_#%v", ix)
 			if named, ok := o.(Named); ok {

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ func init() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func TestTCli(t *testing.T) {`
	`47`	`+ t.Parallel()`
`47`	`48`	`ctx := context.Background()`
`48`	`49`
`49`	`50`	`container, err := tcli.NewContainerRunner(ctx, &tcli.ContainerConfig{`
`@@ -92,6 +93,7 @@ func TestTCli(t *testing.T) {`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`func TestHostRunner(t *testing.T) {`
	`96`	`+ t.Parallel()`
`95`	`97`	`var (`
`96`	`98`	`c tcli.HostRunner`
`97`	`99`	`ctx = context.Background()`
`@@ -114,6 +116,7 @@ func TestHostRunner(t *testing.T) {`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`func TestCoderCLI(t *testing.T) {`
	`119`	`+ t.Parallel()`
`117`	`120`	`ctx, cancel := context.WithTimeout(context.Background(), time.Minute*5)`
`118`	`121`	`defer cancel()`
`119`	`122`
`@@ -141,7 +144,11 @@ func TestCoderCLI(t *testing.T) {`
`141`	`144`	`)`
`142`	`145`
`143`	`146`	`creds := login(ctx, t)`
`144`		`- c.Run(ctx, fmt.Sprintf("mkdir -p ~/.config/coder && echo -ne %s > ~/.config/coder/session", creds.token)).Assert(t,`
	`147`	`+ cmd := exec.CommandContext(ctx, "mkdir -p ~/.config/coder && cat > ~/.config/coder/session")`
	`148`	`+`
	`149`	`+ // !IMPORTANT: be careful that this does not appear in logs`
	`150`	`+ cmd.Stdin = strings.NewReader(creds.token)`
	`151`	`+ c.RunCmd(cmd).Assert(t,`
`145`	`152`	`tcli.Success(),`
`146`	`153`	`)`
`147`	`154`	`c.Run(ctx, fmt.Sprintf("echo -ne %s > ~/.config/coder/url", creds.url)).Assert(t,`