Fix coderd test leak

kylecarbs · kylecarbs · commit 57efae223371 · 2022-02-05T08:37:13.000Z
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -3,7 +3,6 @@ package coderdtest
 import (
 	"context"
 	"database/sql"
-	"fmt"
 	"io"
 	"net/http/httptest"
 	"net/url"
@@ -154,7 +153,6 @@ func AwaitProjectVersionImported(t *testing.T, client *codersdk.Client, organiza
 		var err error
 		projectVersion, err = client.ProjectVersion(context.Background(), organization, project, version)
 		require.NoError(t, err)
-		fmt.Printf("GOT: %s\n", projectVersion.Import.Status)
 		return projectVersion.Import.Status.Completed()
 	}, 3*time.Second, 25*time.Millisecond)
 	return projectVersion
diff --git a/coderd/coderdtest/coderdtest_test.go b/coderd/coderdtest/coderdtest_test.go
@@ -1,11 +1,16 @@
 package coderdtest_test
 
 import (
+	"context"
 	"testing"
 
 	"go.uber.org/goleak"
 
+	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/coderd"
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/database"
 )
 
 func TestMain(m *testing.M) {
@@ -15,6 +20,17 @@ func TestMain(m *testing.M) {
 func TestNew(t *testing.T) {
 	t.Parallel()
 	client := coderdtest.New(t)
-	_ = coderdtest.CreateInitialUser(t, client)
-	_ = coderdtest.NewProvisionerDaemon(t, client)
+	user := coderdtest.CreateInitialUser(t, client)
+	closer := coderdtest.NewProvisionerDaemon(t, client)
+	project := coderdtest.CreateProject(t, client, user.Organization)
+	version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
+	coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
+	workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
+	history, err := client.CreateWorkspaceHistory(context.Background(), "me", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
+		ProjectVersionID: version.ID,
+		Transition:       database.WorkspaceTransitionCreate,
+	})
+	require.NoError(t, err)
+	coderdtest.AwaitWorkspaceHistoryProvisioned(t, client, "me", workspace.Name, history.Name)
+	closer.Close()
 }
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"reflect"
 	"time"
@@ -75,7 +76,9 @@ func (api *api) provisionerDaemonsServe(rw http.ResponseWriter, r *http.Request)
 	// Multiplexes the incoming connection using yamux.
 	// This allows multiple function calls to occur over
 	// the same connection.
-	session, err := yamux.Server(websocket.NetConn(r.Context(), conn, websocket.MessageBinary), nil)
+	config := yamux.DefaultConfig()
+	config.LogOutput = io.Discard
+	session, err := yamux.Server(websocket.NetConn(r.Context(), conn, websocket.MessageBinary), config)
 	if err != nil {
 		_ = conn.Close(websocket.StatusInternalError, fmt.Sprintf("multiplex server: %s", err))
 		return
diff --git a/codersdk/provisioners.go b/codersdk/provisioners.go
@@ -3,6 +3,7 @@ package codersdk
 import (
 	"context"
 	"encoding/json"
+	"io"
 	"net/http"
 
 	"github.com/hashicorp/yamux"
@@ -42,7 +43,9 @@ func (c *Client) ProvisionerDaemonClient(ctx context.Context) (proto.DRPCProvisi
 		}
 		return nil, readBodyAsError(res)
 	}
-	session, err := yamux.Client(websocket.NetConn(context.Background(), conn, websocket.MessageBinary), nil)
+	config := yamux.DefaultConfig()
+	config.LogOutput = io.Discard
+	session, err := yamux.Client(websocket.NetConn(ctx, conn, websocket.MessageBinary), config)
 	if err != nil {
 		return nil, xerrors.Errorf("multiplex client: %w", err)
 	}
diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go
@@ -68,7 +68,8 @@ func (*echo) Parse(request *proto.Parse_Request, stream proto.DRPCProvisioner_Pa
 			return err
 		}
 	}
-	return nil
+	<-stream.Context().Done()
+	return stream.Context().Err()
 }
 
 // Provision reads requests from the provided directory to stream responses.
@@ -97,7 +98,8 @@ func (*echo) Provision(request *proto.Provision_Request, stream proto.DRPCProvis
 			return err
 		}
 	}
-	return nil
+	<-stream.Context().Done()
+	return stream.Context().Err()
 }
 
 type Responses struct {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package codersdk`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"encoding/json"`
	`6`	`+ "io"`
`6`	`7`	`"net/http"`
`7`	`8`
`8`	`9`	`"github.com/hashicorp/yamux"`
`@@ -42,7 +43,9 @@ func (c *Client) ProvisionerDaemonClient(ctx context.Context) (proto.DRPCProvisi`
`42`	`43`	`}`
`43`	`44`	`return nil, readBodyAsError(res)`
`44`	`45`	`}`
`45`		`- session, err := yamux.Client(websocket.NetConn(context.Background(), conn, websocket.MessageBinary), nil)`
	`46`	`+ config := yamux.DefaultConfig()`
	`47`	`+ config.LogOutput = io.Discard`
	`48`	`+ session, err := yamux.Client(websocket.NetConn(ctx, conn, websocket.MessageBinary), config)`
`46`	`49`	`if err != nil {`
`47`	`50`	`return nil, xerrors.Errorf("multiplex client: %w", err)`
`48`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ func (echo) Parse(request proto.Parse_Request, stream proto.DRPCProvisioner_Pa`
`68`	`68`	`return err`
`69`	`69`	`}`
`70`	`70`	`}`
`71`		`- return nil`
	`71`	`+ <-stream.Context().Done()`
	`72`	`+ return stream.Context().Err()`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`// Provision reads requests from the provided directory to stream responses.`
`@@ -97,7 +98,8 @@ func (echo) Provision(request proto.Provision_Request, stream proto.DRPCProvis`
`97`	`98`	`return err`
`98`	`99`	`}`
`99`	`100`	`}`
`100`		`- return nil`
	`101`	`+ <-stream.Context().Done()`
	`102`	`+ return stream.Context().Err()`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`type Responses struct {`