Fix unit test job tags

Emyrk · Emyrk · commit 2ddb5441f3fa · 2023-10-03T16:14:32.000-05:00
diff --git a/coderd/database/db2sdk/db2sdk_test.go b/coderd/database/db2sdk/db2sdk_test.go
@@ -4,6 +4,7 @@ import (
 	"crypto/rand"
 	"database/sql"
 	"encoding/json"
+	"fmt"
 	"testing"
 	"time"
 
@@ -117,8 +118,9 @@ func TestProvisionerJobStatus(t *testing.T) {
 	db, _ := dbtestutil.NewDB(t)
 	org := dbgen.Organization(t, db, database.Organization{})
 
-	for _, tc := range cases {
+	for i, tc := range cases {
 		tc := tc
+		i := i
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			// Populate standard fields
@@ -130,6 +132,8 @@ func TestProvisionerJobStatus(t *testing.T) {
 			tc.job.OrganizationID = org.ID
 			tc.job.Input = []byte("{}")
 			tc.job.Provisioner = database.ProvisionerTypeEcho
+			// Unique tags for each job.
+			tc.job.Tags = map[string]string{fmt.Sprintf("%d", i): "true"}
 
 			inserted := dbgen.ProvisionerJob(t, db, nil, tc.job)
 			// Make sure the inserted job has the right values.
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -328,16 +328,16 @@ func GroupMember(t testing.TB, db database.Store, orig database.GroupMember) dat
 // ProvisionerJob is a bit more involved to get the values such as "completedAt", "startedAt", "cancelledAt" set.  ps
 // can be set to nil if you are SURE that you don't require a provisionerdaemon to acquire the job in your test.
 func ProvisionerJob(t testing.TB, db database.Store, ps pubsub.Pubsub, orig database.ProvisionerJob) database.ProvisionerJob {
-	id := takeFirst(orig.ID, uuid.New())
+	jobID := takeFirst(orig.ID, uuid.New())
 	// Always set some tags to prevent Acquire from grabbing jobs it should not.
 	if !orig.StartedAt.Time.IsZero() {
 		if orig.Tags == nil {
 			orig.Tags = make(database.StringMap)
 		}
 		// Make sure when we acquire the job, we only get this one.
-		orig.Tags[id.String()] = "true"
+		orig.Tags[jobID.String()] = "true"
 	}
-	jobID := takeFirst(orig.ID, uuid.New())
+
 	job, err := db.InsertProvisionerJob(genCtx, database.InsertProvisionerJobParams{
 		ID:             jobID,
 		CreatedAt:      takeFirst(orig.CreatedAt, dbtime.Now()),
@@ -365,6 +365,11 @@ func ProvisionerJob(t testing.TB, db database.Store, ps pubsub.Pubsub, orig data
 			WorkerID:  uuid.NullUUID{},
 		})
 		require.NoError(t, err)
+		if job.ID != jobID {
+			fmt.Println("wtf")
+		}
+		// There is no easy way to make sure we aquire the correct job.
+		require.Equal(t, jobID, job.ID, "acquired incorrect job")
 	}
 
 	if !orig.CompletedAt.Time.IsZero() || orig.Error.String != "" {
diff --git a/coderd/provisionerjobs_internal_test.go b/coderd/provisionerjobs_internal_test.go
@@ -248,7 +248,7 @@ func Test_logFollower_completeBeforeSubscribe(t *testing.T) {
 				Time:  now.Add(-time.Millisecond),
 				Valid: true,
 			},
-			JobStatus: database.ProvisionerJobStatusRunning,
+			JobStatus: database.ProvisionerJobStatusSucceeded,
 		},
 		nil,
 	)
diff --git a/site/src/pages/TemplateVersionEditorPage/TemplateVersionStatusBadge.tsx b/site/src/pages/TemplateVersionEditorPage/TemplateVersionStatusBadge.tsx
@@ -56,6 +56,7 @@ export const getStatus = (
         text: "Canceled",
         icon: <ErrorIcon />,
       };
+    case "unknown":
     case "failed":
       return {
         type: "error",
diff --git a/site/src/utils/workspace.tsx b/site/src/utils/workspace.tsx
@@ -51,14 +51,9 @@ export const getDisplayWorkspaceBuildStatus = (
         color: theme.palette.primary.main,
         status: DisplayWorkspaceBuildStatusLanguage.running,
       } as const;
-    case "failed":
-      return {
-        type: "error",
-        color: theme.palette.text.secondary,
-        status: DisplayWorkspaceBuildStatusLanguage.failed,
-      } as const;
     // Just handle unknown as failed
     case "unknown":
+    case "failed":
       return {
         type: "error",
         color: theme.palette.text.secondary,

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ func Test_logFollower_completeBeforeSubscribe(t *testing.T) {`
`248`	`248`	`Time: now.Add(-time.Millisecond),`
`249`	`249`	`Valid: true,`
`250`	`250`	`},`
`251`		`- JobStatus: database.ProvisionerJobStatusRunning,`
	`251`	`+ JobStatus: database.ProvisionerJobStatusSucceeded,`
`252`	`252`	`},`
`253`	`253`	`nil,`
`254`	`254`	`)`