Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3aad7af

Browse files
EmyrkEmyrk
committed
Fix unit tests
1 parent e7a4034 commit 3aad7af

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

‎coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,8 @@ func TestUpdateJob(t *testing.T) {
558558
t.Parallel()
559559
srv := setup(t, false)
560560
job := setupJob(t, srv)
561-
version, err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
561+
versionID := uuid.New()
562+
err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
562563
ID: uuid.New(),
563564
JobID: job,
564565
})
@@ -569,7 +570,7 @@ func TestUpdateJob(t *testing.T) {
569570
})
570571
require.NoError(t, err)
571572

572-
version, err = srv.Database.GetTemplateVersionByID(ctx, version.ID)
573+
version, err := srv.Database.GetTemplateVersionByID(ctx, versionID)
573574
require.NoError(t, err)
574575
require.Equal(t, "# hello world", version.Readme)
575576
})
@@ -583,8 +584,9 @@ func TestUpdateJob(t *testing.T) {
583584

584585
srv := setup(t, false)
585586
job := setupJob(t, srv)
586-
version, err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
587-
ID: uuid.New(),
587+
versionID := uuid.New()
588+
err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
589+
ID: versionID,
588590
JobID: job,
589591
})
590592
require.NoError(t, err)
@@ -616,7 +618,7 @@ func TestUpdateJob(t *testing.T) {
616618
require.NoError(t, err)
617619
require.Len(t, response.VariableValues, 2)
618620

619-
templateVariables, err := srv.Database.GetTemplateVersionVariables(ctx, version.ID)
621+
templateVariables, err := srv.Database.GetTemplateVersionVariables(ctx, versionID)
620622
require.NoError(t, err)
621623
require.Len(t, templateVariables, 2)
622624
require.Equal(t, templateVariables[0].Value, firstTemplateVariable.DefaultValue)
@@ -629,8 +631,9 @@ func TestUpdateJob(t *testing.T) {
629631

630632
srv := setup(t, false)
631633
job := setupJob(t, srv)
632-
version, err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
633-
ID: uuid.New(),
634+
versionID := uuid.New()
635+
err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
636+
ID: versionID,
634637
JobID: job,
635638
})
636639
require.NoError(t, err)
@@ -658,7 +661,7 @@ func TestUpdateJob(t *testing.T) {
658661

659662
// Even though there is an error returned, variables are stored in the database
660663
// to show the schema in the site UI.
661-
templateVariables, err := srv.Database.GetTemplateVersionVariables(ctx, version.ID)
664+
templateVariables, err := srv.Database.GetTemplateVersionVariables(ctx, versionID)
662665
require.NoError(t, err)
663666
require.Len(t, templateVariables, 2)
664667
require.Equal(t, templateVariables[0].Value, firstTemplateVariable.DefaultValue)
@@ -761,6 +764,7 @@ func TestFailJob(t *testing.T) {
761764
WorkspaceBuildID: buildID,
762765
})
763766
require.NoError(t, err)
767+
764768
job, err := srv.Database.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
765769
ID: uuid.New(),
766770
Input: input,
@@ -779,7 +783,7 @@ func TestFailJob(t *testing.T) {
779783
require.NoError(t, err)
780784

781785
publishedWorkspace := make(chan struct{})
782-
closeWorkspaceSubscribe, err := srv.Pubsub.Subscribe(codersdk.WorkspaceNotifyChannel(build.WorkspaceID), func(_ context.Context, _ []byte) {
786+
closeWorkspaceSubscribe, err := srv.Pubsub.Subscribe(codersdk.WorkspaceNotifyChannel(workspace.ID), func(_ context.Context, _ []byte) {
783787
close(publishedWorkspace)
784788
})
785789
require.NoError(t, err)
@@ -802,7 +806,7 @@ func TestFailJob(t *testing.T) {
802806
require.NoError(t, err)
803807
<-publishedWorkspace
804808
<-publishedLogs
805-
build, err = srv.Database.GetWorkspaceBuildByID(ctx, build.ID)
809+
build, err := srv.Database.GetWorkspaceBuildByID(ctx, buildID)
806810
require.NoError(t, err)
807811
require.Equal(t, "some state", string(build.ProvisionerState))
808812
})
@@ -852,15 +856,16 @@ func TestCompleteJob(t *testing.T) {
852856
t.Parallel()
853857
srv := setup(t, false)
854858
jobID := uuid.New()
855-
version, err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
856-
ID: uuid.New(),
859+
versionID := uuid.New()
860+
err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
861+
ID: versionID
857862
JobID: jobID,
858863
})
859864
require.NoError(t, err)
860865
job, err := srv.Database.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
861866
ID: jobID,
862867
Provisioner: database.ProvisionerTypeEcho,
863-
Input: []byte(`{"template_version_id": "` + version.ID.String() + `"}`),
868+
Input: []byte(`{"template_version_id": "` + versionID.String() + `"}`),
864869
StorageMethod: database.ProvisionerStorageMethodFile,
865870
Type: database.ProvisionerJobTypeWorkspaceBuild,
866871
})

0 commit comments

Comments
 (0)