Fix racey test by allowing logs before

kylecarbs · kylecarbs · commit 714e962a2a6c · 2022-02-07T21:09:31.000Z
diff --git a/coderd/provisionerjoblogs_test.go b/coderd/provisionerjoblogs_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/coder/coder/provisionersdk/proto"
 )
 
-func TestWorkspaceHistoryLogsByName(t *testing.T) {
+func TestProvisionerJobLogsByName(t *testing.T) {
 	t.Parallel()
 	t.Run("List", func(t *testing.T) {
 		t.Parallel()
@@ -44,17 +44,10 @@ func TestWorkspaceHistoryLogsByName(t *testing.T) {
 			Transition:       database.WorkspaceTransitionCreate,
 		})
 		require.NoError(t, err)
-
-		// Successfully return empty logs before the job starts!
-		logs, err := client.ProvisionerJobLogs(context.Background(), history.Provision.ID)
-		require.NoError(t, err)
-		require.NotNil(t, logs)
-		require.Len(t, logs, 0)
-
 		coderdtest.AwaitWorkspaceHistoryProvisioned(t, client, "", workspace.Name, history.Name)
 
 		// Return the log after completion!
-		logs, err = client.ProvisionerJobLogs(context.Background(), history.Provision.ID)
+		logs, err := client.ProvisionerJobLogs(context.Background(), history.Provision.ID)
 		require.NoError(t, err)
 		require.NotNil(t, logs)
 		require.Len(t, logs, 1)
diff --git a/database/query.sql b/database/query.sql
@@ -372,8 +372,8 @@ VALUES
 INSERT INTO
   provisioner_job_log
 SELECT
-  @job_id :: uuid AS job_id,
   unnest(@id :: uuid [ ]) AS id,
+  @job_id :: uuid AS job_id,
   unnest(@created_at :: timestamptz [ ]) AS created_at,
   unnest(@source :: log_source [ ]) as source,
   unnest(@level :: log_level [ ]) as level,
diff --git a/database/query.sql.go b/database/query.sql.go
