Merge remote-tracking branch 'origin/main' into jjs/15065

SasSwart · SasSwart · commit 26aa87dba52c · 2024-10-15T15:37:46.000Z
diff --git a/Makefile b/Makefile
@@ -507,7 +507,8 @@ gen: \
 	examples/examples.gen.json \
 	tailnet/tailnettest/coordinatormock.go \
 	tailnet/tailnettest/coordinateemock.go \
-	tailnet/tailnettest/multiagentmock.go
+	tailnet/tailnettest/multiagentmock.go \
+	coderd/database/pubsub/psmock/psmock.go
 .PHONY: gen
 
 # Mark all generated files as fresh so make thinks they're up-to-date. This is
@@ -537,6 +538,7 @@ gen/mark-fresh:
 		tailnet/tailnettest/coordinatormock.go \
 		tailnet/tailnettest/coordinateemock.go \
 		tailnet/tailnettest/multiagentmock.go \
+		coderd/database/pubsub/psmock/psmock.go \
 		"
 
 	for file in $$files; do
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
@@ -1183,9 +1183,8 @@ func TestPostWorkspaceBuild(t *testing.T) {
 	})
 }
 
+//nolint:paralleltest
 func TestWorkspaceBuildTimings(t *testing.T) {
-	t.Parallel()
-
 	// Setup the test environment with a template and version
 	db, pubsub := dbtestutil.NewDB(t)
 	client := coderdtest.New(t, &coderdtest.Options{
@@ -1214,16 +1213,15 @@ func TestWorkspaceBuildTimings(t *testing.T) {
 		ActiveVersionID: version.ID,
 		CreatedBy:       owner.UserID,
 	})
-	ws := dbgen.Workspace(t, db, database.Workspace{
-		OwnerID:        owner.UserID,
-		OrganizationID: owner.OrganizationID,
-		TemplateID:     template.ID,
-	})
 
-	// Create a build to attach timings
-	var buildNumber int32
+	// Tests will run in parallel. To avoid conflicts and race conditions on the
+	// build number, each test will have its own workspace and build.
 	makeBuild := func() database.WorkspaceBuild {
-		buildNumber++
+		ws := dbgen.Workspace(t, db, database.Workspace{
+			OwnerID:        owner.UserID,
+			OrganizationID: owner.OrganizationID,
+			TemplateID:     template.ID,
+		})
 		jobID := uuid.New()
 		job := dbgen.ProvisionerJob(t, db, pubsub, database.ProvisionerJob{
 			ID:             jobID,
@@ -1235,13 +1233,12 @@ func TestWorkspaceBuildTimings(t *testing.T) {
 			TemplateVersionID: version.ID,
 			InitiatorID:       owner.UserID,
 			JobID:             job.ID,
-			BuildNumber:       buildNumber,
+			BuildNumber:       1,
 		})
 	}
 
+	//nolint:paralleltest
 	t.Run("NonExistentBuild", func(t *testing.T) {
-		t.Parallel()
-
 		// When: fetching an inexistent build
 		buildID := uuid.New()
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
@@ -1253,9 +1250,8 @@ func TestWorkspaceBuildTimings(t *testing.T) {
 		require.Contains(t, err.Error(), "not found")
 	})
 
+	//nolint:paralleltest
 	t.Run("EmptyTimings", func(t *testing.T) {
-		t.Parallel()
-
 		// When: fetching timings for a build with no timings
 		build := makeBuild()
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
@@ -1268,9 +1264,8 @@ func TestWorkspaceBuildTimings(t *testing.T) {
 		require.Empty(t, res.AgentScriptTimings)
 	})
 
+	//nolint:paralleltest
 	t.Run("ProvisionerTimings", func(t *testing.T) {
-		t.Parallel()
-
 		// When: fetching timings for a build with provisioner timings
 		build := makeBuild()
 		provisionerTimings := dbgen.ProvisionerJobTimings(t, db, build, 5)
@@ -1295,9 +1290,8 @@ func TestWorkspaceBuildTimings(t *testing.T) {
 		}
 	})
 
+	//nolint:paralleltest
 	t.Run("AgentScriptTimings", func(t *testing.T) {
-		t.Parallel()
-
 		// When: fetching timings for a build with agent script timings
 		build := makeBuild()
 		resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
@@ -1329,9 +1323,8 @@ func TestWorkspaceBuildTimings(t *testing.T) {
 		}
 	})
 
+	//nolint:paralleltest
 	t.Run("NoAgentScripts", func(t *testing.T) {
-		t.Parallel()
-
 		// When: fetching timings for a build with no agent scripts
 		build := makeBuild()
 		resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
@@ -1350,16 +1343,16 @@ func TestWorkspaceBuildTimings(t *testing.T) {
 	})
 
 	// Some workspaces might not have agents. It is improbable, but possible.
+	//nolint:paralleltest
 	t.Run("NoAgents", func(t *testing.T) {
-		t.Parallel()
-
 		// When: fetching timings for a build with no agents
 		build := makeBuild()
 		dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
 			JobID: build.JobID,
 		})
 
 		// Then: return a response with empty agent script timings
+		// trigger build
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		t.Cleanup(cancel)
 		res, err := client.WorkspaceBuildTimings(ctx, build.ID)
diff --git a/scaletest/createworkspaces/run_test.go b/scaletest/createworkspaces/run_test.go
@@ -31,6 +31,7 @@ import (
 
 func Test_Runner(t *testing.T) {
 	t.Parallel()
+
 	if testutil.RaceEnabled() {
 		t.Skip("Race detector enabled, skipping time-sensitive test.")
 	}
diff --git a/scaletest/reconnectingpty/run_test.go b/scaletest/reconnectingpty/run_test.go
@@ -22,6 +22,7 @@ import (
 
 func Test_Runner(t *testing.T) {
 	t.Parallel()
+	t.Skip("https://github.com/coder/internal/issues/98")
 
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
diff --git a/vpn/serdes.go b/vpn/serdes.go
@@ -103,12 +103,16 @@ func (s *serdes[_, _, _]) closeIdempotent() {
 	})
 }
 
+// Close closes the serdes
+// nolint: revive
 func (s *serdes[_, _, _]) Close() error {
 	s.closeIdempotent()
 	s.wg.Wait()
 	return nil
 }
 
+// start starts the goroutines that serialize and deserialize to the conn.
+// nolint: revive
 func (s *serdes[_, _, _]) start() {
 	s.wg.Add(2)
 	go func() {
diff --git a/vpn/speaker.go b/vpn/speaker.go
@@ -186,6 +186,7 @@ func (s *speaker[S, R, _]) recvFromSerdes() {
 	}
 }
 
+// Close closes the speaker
 // nolint: revive
 func (s *speaker[_, _, _]) Close() error {
 	s.cancel()

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ import (`
`31`	`31`
`32`	`32`	`func Test_Runner(t *testing.T) {`
`33`	`33`	`t.Parallel()`
	`34`	`+`
`34`	`35`	`if testutil.RaceEnabled() {`
`35`	`36`	`t.Skip("Race detector enabled, skipping time-sensitive test.")`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ func (s *speaker[S, R, _]) recvFromSerdes() {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
	`189`	`+// Close closes the speaker`
`189`	`190`	`// nolint: revive`
`190`	`191`	`func (s *speaker[_, _, _]) Close() error {`
`191`	`192`	`s.cancel()`