Merge branch 'main' into 98-flaky-fix

mtojek · mtojek · commit 966822ada0a2 · 2024-10-15T15:54:09.000+02:00
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
@@ -1214,16 +1214,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,7 +1234,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {
 			TemplateVersionID: version.ID,
 			InitiatorID:       owner.UserID,
 			JobID:             job.ID,
-			BuildNumber:       buildNumber,
+			BuildNumber:       1,
 		})
 	}
 
diff --git a/scaletest/reconnectingpty/run_test.go b/scaletest/reconnectingpty/run_test.go
@@ -23,6 +23,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()
