Check for successful provisioner connection in test

dwahler · dwahler · commit 57926bb85d86 · 2022-08-26T02:46:31.000Z
diff --git a/cli/provisionerrun_test.go b/cli/provisionerrun_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
+	"github.com/coder/coder/pty/ptytest"
 	"github.com/stretchr/testify/require"
 )
 
@@ -34,7 +35,12 @@ func TestProvisionerRun(t *testing.T) {
 		ctx, cancelFunc := context.WithCancel(context.Background())
 		defer cancelFunc()
 
-		cmd, root := clitest.New(t, "provisioners", "run", "--token", token.String())
+		cmd, root := clitest.New(t, "provisioners", "run",
+			"--token", token.String(),
+			"--verbose", // to test debug-level logs
+		)
+		pty := ptytest.New(t)
+		cmd.SetErr(pty.Output())
 		// command should only have access to provisioner auth token, not user credentials
 		err = root.URL().Write(client.URL.String())
 		require.NoError(t, err)
@@ -43,5 +49,7 @@ func TestProvisionerRun(t *testing.T) {
 			defer close(doneCh)
 			doneCh <- cmd.ExecuteContext(ctx)
 		}()
+
+		pty.ExpectMatch("\tprovisioner client connected")
 	})
 }
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -108,7 +108,7 @@ func (p *Server) connect(ctx context.Context) {
 			continue
 		}
 		p.clientValue.Store(client)
-		p.opts.Logger.Debug(context.Background(), "connected")
+		p.opts.Logger.Debug(context.Background(), "provisioner client connected")
 		break
 	}
 	select {

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func (p *Server) connect(ctx context.Context) {`
`108`	`108`	`continue`
`109`	`109`	`}`
`110`	`110`	`p.clientValue.Store(client)`
`111`		`- p.opts.Logger.Debug(context.Background(), "connected")`
	`111`	`+ p.opts.Logger.Debug(context.Background(), "provisioner client connected")`
`112`	`112`	`break`
`113`	`113`	`}`
`114`	`114`	`select {`