Fix coderd test leak

coder · kylecarbs · Feb 6, 2022 · Feb 5, 2022 · Feb 5, 2022 · Feb 5, 2022
commit 9fa815ce21232e1f634ce5c2e1440a1f2621a5ea
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/peer/conn_test.go b/peer/conn_test.go
@@ -2,7 +2,6 @@ package peer_test
 
 import (
 	"context"
-	"errors"
 	"io"
 	"net"
 	"net/http"
@@ -17,6 +16,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
+	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
@@ -231,7 +231,7 @@ func TestConn(t *testing.T) {
 		t.Parallel()
 		conn, err := peer.Client([]webrtc.ICEServer{}, nil)
 		require.NoError(t, err)
-		expectedErr := errors.New("wow")
+		expectedErr := xerrors.New("wow")
 		_ = conn.CloseWithError(expectedErr)
 		_, err = conn.Dial(context.Background(), "", nil)
 		require.ErrorIs(t, err, expectedErr)

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 {

diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go
@@ -4,7 +4,6 @@ import (
 	"archive/tar"
 	"bytes"
 	"context"
-	"errors"
 	"io"
 	"os"
 	"path/filepath"
@@ -15,6 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/atomic"
 	"go.uber.org/goleak"
+	"golang.org/x/xerrors"
 	"storj.io/drpc/drpcmux"
 	"storj.io/drpc/drpcserver"
 
@@ -52,7 +52,7 @@ func TestProvisionerd(t *testing.T) {
 		completeChan := make(chan struct{})
 		closer := createProvisionerd(t, func(ctx context.Context) (proto.DRPCProvisionerDaemonClient, error) {
 			defer close(completeChan)
-			return nil, errors.New("an error")
+			return nil, xerrors.New("an error")
 		}, provisionerd.Provisioners{})
 		<-completeChan
 		require.NoError(t, closer.Close())