Merge branch 'main' into mafredri/test-fix-agent-wait

mafredri · web-flow · commit 996c9b5a1bec · 2023-04-21T18:46:54.000+03:00
diff --git a/coderd/workspaceapps/apptest/apptest.go b/coderd/workspaceapps/apptest/apptest.go
@@ -47,7 +47,7 @@ func Run(t *testing.T, factory DeploymentFactory) {
 			t.Skip("ConPTY appears to be inconsistent on Windows.")
 		}
 
-		expectLine := func(r *bufio.Reader, matcher func(string) bool) {
+		expectLine := func(t *testing.T, r *bufio.Reader, matcher func(string) bool) {
 			for {
 				line, err := r.ReadString('\n')
 				require.NoError(t, err)
@@ -98,8 +98,8 @@ func Run(t *testing.T, factory DeploymentFactory) {
 			_, err = conn.Write(data)
 			require.NoError(t, err)
 
-			expectLine(bufRead, matchEchoCommand)
-			expectLine(bufRead, matchEchoOutput)
+			expectLine(t, bufRead, matchEchoCommand)
+			expectLine(t, bufRead, matchEchoOutput)
 		})
 
 		t.Run("SignedTokenQueryParameter", func(t *testing.T) {
@@ -148,7 +148,7 @@ func Run(t *testing.T, factory DeploymentFactory) {
 			conn := websocket.NetConn(ctx, wsConn, websocket.MessageBinary)
 			bufRead := bufio.NewReader(conn)
 
-			expectLine(bufRead, matchEchoOutput)
+			expectLine(t, bufRead, matchEchoOutput)
 		})
 	})
 
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
@@ -572,8 +572,7 @@ func TestWorkspaceBuildState(t *testing.T) {
 
 func TestWorkspaceBuildStatus(t *testing.T) {
 	t.Parallel()
-	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
-	defer cancel()
+
 	auditor := audit.NewMock()
 	numLogs := len(auditor.AuditLogs())
 	client, closeDaemon, api := coderdtest.NewWithAPI(t, &coderdtest.Options{IncludeProvisionerDaemon: true, Auditor: auditor})
@@ -597,6 +596,10 @@ func TestWorkspaceBuildStatus(t *testing.T) {
 	closeDaemon = coderdtest.NewProvisionerDaemon(t, api)
 	// after successful build is "running"
 	_ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
+
+	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+	defer cancel()
+
 	workspace, err := client.Workspace(ctx, workspace.ID)
 	require.NoError(t, err)
 	require.EqualValues(t, codersdk.WorkspaceStatusRunning, workspace.LatestBuild.Status)
diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -980,7 +980,6 @@ func TestReadFileWithTemplateUpdate(t *testing.T) {
 	t.Parallel()
 	t.Run("HasTemplateUpdate", func(t *testing.T) {
 		t.Parallel()
-		ctx := testutil.Context(t, testutil.WaitMedium)
 
 		// Upload a file
 		client := coderdenttest.New(t, nil)
@@ -991,6 +990,8 @@ func TestReadFileWithTemplateUpdate(t *testing.T) {
 			},
 		})
 
+		ctx := testutil.Context(t, testutil.WaitLong)
+
 		resp, err := client.Upload(ctx, codersdk.ContentTypeTar, bytes.NewReader(make([]byte, 1024)))
 		require.NoError(t, err)
 
