Skip to content

Commit bf46467

Browse files
sreyasreya
committed
fix remaining tests
1 parent 76de0c7 commit bf46467

File tree

6 files changed

+117
-28
lines changed

6 files changed

+117
-28
lines changed

‎cli/create_test.go

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cli_test
22

33
import (
44
"context"
5-
"database/sql"
65
"fmt"
76
"os"
87
"testing"
@@ -13,7 +12,6 @@ import (
1312

1413
"github.com/coder/coder/cli/clitest"
1514
"github.com/coder/coder/coderd/coderdtest"
16-
"github.com/coder/coder/coderd/database"
1715
"github.com/coder/coder/codersdk"
1816
"github.com/coder/coder/provisioner/echo"
1917
"github.com/coder/coder/provisionersdk/proto"
@@ -255,44 +253,55 @@ func TestCreate(t *testing.T) {
255253

256254
t.Run("FailedDryRun", func(t *testing.T) {
257255
t.Parallel()
258-
client, api := coderdtest.NewWithAPI(t, &coderdtest.Options{IncludeProvisionerD: true})
256+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
259257
user := coderdtest.CreateFirstUser(t, client)
260258
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
261-
Parse: echo.ParseComplete,
259+
Parse: []*proto.Parse_Response{{
260+
Type: &proto.Parse_Response_Complete{
261+
Complete: &proto.Parse_Complete{
262+
ParameterSchemas: []*proto.ParameterSchema{
263+
{
264+
AllowOverrideSource: true,
265+
Name: echo.ParameterExecKey,
266+
Description: "description 1",
267+
DefaultSource: &proto.ParameterSource{
268+
Scheme: proto.ParameterSource_DATA,
269+
Value: "exit 0",
270+
},
271+
DefaultDestination: &proto.ParameterDestination{
272+
Scheme: proto.ParameterDestination_PROVISIONER_VARIABLE,
273+
},
274+
},
275+
},
276+
},
277+
},
278+
}},
262279
ProvisionDryRun: []*proto.Provision_Response{
263280
{
264281
Type: &proto.Provision_Response_Complete{
265-
Complete: &proto.Provision_Complete{
266-
Error: "test error",
267-
},
282+
Complete: &proto.Provision_Complete{},
268283
},
269284
},
270285
},
271286
})
272287

288+
tempDir := t.TempDir()
289+
parameterFile, _ := os.CreateTemp(tempDir, "testParameterFile*.yaml")
290+
_, _ = parameterFile.WriteString(fmt.Sprintf("%s: %q", echo.ParameterExecKey, "exit 1"))
291+
273292
// The template import job should end up failed, but we need it to be
274293
// succeeded so the dry-run can begin.
275294
version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
276-
require.Equal(t, codersdk.ProvisionerJobFailed, version.Job.Status, "job is not failed")
277-
err := api.Database.UpdateProvisionerJobWithCompleteByID(context.Background(), database.UpdateProvisionerJobWithCompleteByIDParams{
278-
ID: version.Job.ID,
279-
CompletedAt: sql.NullTime{
280-
Time: time.Now(),
281-
Valid: true,
282-
},
283-
UpdatedAt: time.Now(),
284-
Error: sql.NullString{},
285-
})
286-
require.NoError(t, err, "update provisioner job")
295+
require.Equal(t, codersdk.ProvisionerJobSucceeded, version.Job.Status, "job is not failed")
287296

288297
_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
289-
cmd, root := clitest.New(t, "create", "test")
298+
cmd, root := clitest.New(t, "create", "test", "--parameter-file", parameterFile.Name())
290299
clitest.SetupConfig(t, client, root)
291300
pty := ptytest.New(t)
292301
cmd.SetIn(pty.Input())
293302
cmd.SetOut(pty.Output())
294303

295-
err = cmd.Execute()
304+
err := cmd.Execute()
296305
require.Error(t, err)
297306
require.ErrorContains(t, err, "dry-run workspace")
298307
})

‎coderd/coderdtest/coderdtest.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ type Options struct {
7676

7777
// New constructs a codersdk client connected to an in-memory API instance.
7878
func New(t *testing.T, options *Options) *codersdk.Client {
79-
client, _ := NewWithAPI(t, options)
79+
client, _ := newWithAPI(t, options)
8080
return client
8181
}
8282

83-
// NewWithAPI constructs a codersdk client connected to the returned in-memory API instance.
84-
func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, *coderd.API) {
83+
// newWithAPI constructs a codersdk client connected to the returned in-memory API instance.
84+
func newWithAPI(t *testing.T, options *Options) (*codersdk.Client, *coderd.API) {
8585
if options == nil {
8686
options = &Options{}
8787
}

‎coderd/coderdtest/coderdtest_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ func TestMain(m *testing.M) {
1414

1515
func TestNew(t *testing.T) {
1616
t.Parallel()
17-
client, coderAPI := coderdtest.NewWithAPI(t, nil)
17+
client := coderdtest.New(t, &coderdtest.Options{
18+
IncludeProvisionerD: true,
19+
})
1820
user := coderdtest.CreateFirstUser(t, client)
19-
closer := coderdtest.NewProvisionerDaemon(t, coderAPI)
2021
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
2122
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
2223
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -25,5 +26,4 @@ func TestNew(t *testing.T) {
2526
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
2627
_, _ = coderdtest.NewGoogleInstanceIdentity(t, "example", false)
2728
_, _ = coderdtest.NewAWSInstanceIdentity(t, "an-instance")
28-
closer.Close()
2929
}

‎coderd/out.txt

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
=== RUN TestTemplateVersionDryRun
2+
=== PAUSE TestTemplateVersionDryRun
3+
=== CONT TestTemplateVersionDryRun
4+
=== RUN TestTemplateVersionDryRun/OK
5+
=== PAUSE TestTemplateVersionDryRun/OK
6+
=== CONT TestTemplateVersionDryRun/OK
7+
t.go:81: 2022-06-22 23:22:14.354 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 POST /api/v2/users/first
8+
t.go:81: 2022-06-22 23:22:14.357 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 POST /api/v2/users/login
9+
t.go:81: 2022-06-22 23:22:14.358 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 POST /api/v2/files
10+
t.go:81: 2022-06-22 23:22:14.359 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 POST /api/v2/organizations/7aa01787-2231-4ddd-9332-0086223719a3/templateversions
11+
t.go:81: 2022-06-22 23:22:14.386 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa
12+
t.go:81: 2022-06-22 23:22:14.412 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa
13+
t.go:81: 2022-06-22 23:22:14.436 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa
14+
t.go:81: 2022-06-22 23:22:14.455 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:134> (*Server).connect connected
15+
t.go:81: 2022-06-22 23:22:14.461 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa
16+
t.go:81: 2022-06-22 23:22:14.466 [DEBUG] (provisionerd-brave_borg8) <github.com/coder/coder/coderd/provisionerdaemons.go:157> (*provisionerdServer).AcquireJob locked job from database {"id": "d3e7db15-a63a-4fc0-a48a-8fffe1d0c89c"}
17+
t.go:81: 2022-06-22 23:22:14.466 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:245> (*Server).acquireJob acquired job {"initiator_username": "testuser", "provisioner": "echo", "id": "d3e7db15-a63a-4fc0-a48a-8fffe1d0c89c"}
18+
t.go:81: 2022-06-22 23:22:14.467 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:359> (*Server).runJob unpacking template source archive {"size_bytes": 5120}
19+
t.go:81: 2022-06-22 23:22:14.467 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 2, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/0.parse.protobuf", "mode": "-rw-------"}
20+
t.go:81: 2022-06-22 23:22:14.467 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 2, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/0.provision.protobuf", "mode": "-rw-------"}
21+
t.go:81: 2022-06-22 23:22:14.467 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 39, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/1.provision.protobuf", "mode": "-rw-------"}
22+
t.go:81: 2022-06-22 23:22:14.467 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 2, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/0.provision.dry.protobuf", "mode": "-rw-------"}
23+
t.go:81: 2022-06-22 23:22:14.467 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 39, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/1.provision.dry.protobuf", "mode": "-rw-------"}
24+
t.go:81: 2022-06-22 23:22:14.467 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:419> (*Server).runJob acquired job is template import
25+
t.go:81: 2022-06-22 23:22:14.468 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:655> (*Server).runTemplateImportParse parse complete {"parameter_schemas": null}
26+
t.go:81: 2022-06-22 23:22:14.470 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:715> (*Server).runTemplateImportProvision template import provision job logged {"level": "TRACE", "output": ""}
27+
t.go:81: 2022-06-22 23:22:14.470 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:745> (*Server).runTemplateImportProvision parse dry-run provision successful {"resource_count": 1, "resources": [{"name": "cool-resource", "type": "cool_resource_type"}], "state_length": 0}
28+
t.go:81: 2022-06-22 23:22:14.471 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:715> (*Server).runTemplateImportProvision template import provision job logged {"level": "TRACE", "output": ""}
29+
t.go:81: 2022-06-22 23:22:14.472 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:745> (*Server).runTemplateImportProvision parse dry-run provision successful {"resource_count": 1, "resources": [{"name": "cool-resource", "type": "cool_resource_type"}], "state_length": 0}
30+
t.go:81: 2022-06-22 23:22:14.475 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
31+
t.go:81: 2022-06-22 23:22:14.486 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
32+
t.go:81: 2022-06-22 23:22:14.486 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa
33+
t.go:81: 2022-06-22 23:22:14.495 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
34+
t.go:81: 2022-06-22 23:22:14.505 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
35+
t.go:81: 2022-06-22 23:22:14.511 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa
36+
t.go:81: 2022-06-22 23:22:14.516 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
37+
t.go:81: 2022-06-22 23:22:14.522 [INFO] (provisionerd-brave_borg8) <github.com/coder/coder/coderd/provisionerdaemons.go:567> (*provisionerdServer).CompleteJob inserting template import job resource {"job_id": "d3e7db15-a63a-4fc0-a48a-8fffe1d0c89c", "resource_name": "cool-resource", "resource_type": "cool_resource_type", "transition": "start"}
38+
t.go:81: 2022-06-22 23:22:14.523 [INFO] (provisionerd-brave_borg8) <github.com/coder/coder/coderd/provisionerdaemons.go:567> (*provisionerdServer).CompleteJob inserting template import job resource {"job_id": "d3e7db15-a63a-4fc0-a48a-8fffe1d0c89c", "resource_name": "cool-resource", "resource_type": "cool_resource_type", "transition": "stop"}
39+
t.go:81: 2022-06-22 23:22:14.523 [DEBUG] (provisionerd-brave_borg8) <github.com/coder/coder/coderd/provisionerdaemons.go:591> (*provisionerdServer).CompleteJob marked import job as completed {"job_id": "d3e7db15-a63a-4fc0-a48a-8fffe1d0c89c"}
40+
t.go:81: 2022-06-22 23:22:14.523 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:463> (*Server).runJob completed job {"id": "d3e7db15-a63a-4fc0-a48a-8fffe1d0c89c"}
41+
t.go:81: 2022-06-22 23:22:14.524 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:321> (*Server).runJob.func2 cleaned up work directory {"error": null}
42+
t.go:81: 2022-06-22 23:22:14.536 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa
43+
t.go:81: 2022-06-22 23:22:14.537 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 POST /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa/dry-run
44+
t.go:81: 2022-06-22 23:22:14.539 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa/dry-run/b5e90a3f-0aab-4479-ab11-3b278804e81e
45+
t.go:81: 2022-06-22 23:22:14.544 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa/dry-run/b5e90a3f-0aab-4479-ab11-3b278804e81e/logs
46+
t.go:81: 2022-06-22 23:22:14.545 [DEBUG] (provisionerd-brave_borg8) <github.com/coder/coder/coderd/provisionerdaemons.go:157> (*provisionerdServer).AcquireJob locked job from database {"id": "b5e90a3f-0aab-4479-ab11-3b278804e81e"}
47+
t.go:81: 2022-06-22 23:22:14.546 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:245> (*Server).acquireJob acquired job {"initiator_username": "testuser", "provisioner": "echo", "id": "b5e90a3f-0aab-4479-ab11-3b278804e81e"}
48+
t.go:81: 2022-06-22 23:22:14.547 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:359> (*Server).runJob unpacking template source archive {"size_bytes": 5120}
49+
t.go:81: 2022-06-22 23:22:14.547 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 2, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/0.parse.protobuf", "mode": "-rw-------"}
50+
t.go:81: 2022-06-22 23:22:14.547 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 2, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/0.provision.protobuf", "mode": "-rw-------"}
51+
t.go:81: 2022-06-22 23:22:14.547 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 39, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/1.provision.protobuf", "mode": "-rw-------"}
52+
t.go:81: 2022-06-22 23:22:14.547 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 2, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/0.provision.dry.protobuf", "mode": "-rw-------"}
53+
t.go:81: 2022-06-22 23:22:14.547 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:409> (*Server).runJob extracted file {"size_bytes": 39, "path": "/tmp/TestTemplateVersionDryRunOK238154715/001/1.provision.dry.protobuf", "mode": "-rw-------"}
54+
t.go:81: 2022-06-22 23:22:14.547 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:424> (*Server).runJob acquired job is template dry-run {"workspace_name": "", "parameters": null}
55+
t.go:81: 2022-06-22 23:22:14.548 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:715> (*Server).runTemplateImportProvision template import provision job logged {"level": "TRACE", "output": ""}
56+
t.go:81: 2022-06-22 23:22:14.548 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:745> (*Server).runTemplateImportProvision parse dry-run provision successful {"resource_count": 1, "resources": [{"name": "cool-resource", "type": "cool_resource_type"}], "state_length": 0}
57+
t.go:81: 2022-06-22 23:22:14.555 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
58+
t.go:81: 2022-06-22 23:22:14.566 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
59+
t.go:81: 2022-06-22 23:22:14.573 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa/dry-run/b5e90a3f-0aab-4479-ab11-3b278804e81e
60+
t.go:81: 2022-06-22 23:22:14.575 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
61+
t.go:81: 2022-06-22 23:22:14.585 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
62+
t.go:81: 2022-06-22 23:22:14.596 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:212> (*Server).acquireJob skipping acquire; job is already running
63+
t.go:81: 2022-06-22 23:22:14.597 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa/dry-run/b5e90a3f-0aab-4479-ab11-3b278804e81e
64+
t.go:81: 2022-06-22 23:22:14.600 [INFO] (provisionerd-brave_borg8) <github.com/coder/coder/coderd/provisionerdaemons.go:668> (*provisionerdServer).CompleteJob inserting template dry-run job resource {"job_id": "b5e90a3f-0aab-4479-ab11-3b278804e81e", "resource_name": "cool-resource", "resource_type": "cool_resource_type"}
65+
t.go:81: 2022-06-22 23:22:14.600 [DEBUG] (provisionerd-brave_borg8) <github.com/coder/coder/coderd/provisionerdaemons.go:690> (*provisionerdServer).CompleteJob marked template dry-run job as completed {"job_id": "b5e90a3f-0aab-4479-ab11-3b278804e81e"}
66+
t.go:81: 2022-06-22 23:22:14.601 [INFO] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:463> (*Server).runJob completed job {"id": "b5e90a3f-0aab-4479-ab11-3b278804e81e"}
67+
t.go:81: 2022-06-22 23:22:14.602 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:321> (*Server).runJob.func2 cleaned up work directory {"error": null}
68+
t.go:81: 2022-06-22 23:22:14.623 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa/dry-run/b5e90a3f-0aab-4479-ab11-3b278804e81e
69+
t.go:81: 2022-06-22 23:22:14.798 [DEBUG] <github.com/coder/coder/coderd/coderd.go:388> debugLogRequest.func1.1 GET /api/v2/templateversions/2970435c-f7ce-48c6-81a7-73735baf6afa/dry-run/b5e90a3f-0aab-4479-ab11-3b278804e81e/resources
70+
t.go:81: 2022-06-22 23:22:14.800 [DEBUG] (provisionerd) <github.com/coder/coder/provisionerd/provisionerd.go:1073> (*Server).closeWithError closing server with error {"error": null}
71+
--- PASS: TestTemplateVersionDryRun (0.00s)
72+
--- PASS: TestTemplateVersionDryRun/OK (0.46s)
73+
PASS
74+
ok github.com/coder/coder/coderd 0.828s

‎coderd/templateversions_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,13 @@ func TestTemplateVersionDryRun(t *testing.T) {
617617
})
618618
require.NoError(t, err)
619619

620-
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
620+
require.Eventually(t, func() bool {
621+
job, err := client.TemplateVersionDryRun(context.Background(), version.ID, job.ID)
622+
assert.NoError(t, err)
623+
624+
t.Logf("Status: %s", job.Status)
625+
return job.Status == codersdk.ProvisionerJobSucceeded
626+
}, 5*time.Second, 25*time.Millisecond)
621627

622628
err = client.CancelTemplateVersionDryRun(context.Background(), version.ID, job.ID)
623629
var apiErr *codersdk.Error

‎coderd/users_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func TestPostLogout(t *testing.T) {
189189
apiKey, err = client.GetAPIKey(ctx, admin.UserID.String(), keyID)
190190
var sdkErr = &codersdk.Error{}
191191
require.ErrorAs(t, err, &sdkErr)
192-
require.Equal(t, http.StatusForbidden, sdkErr.StatusCode(), "Expecting Forbidden")
192+
require.Equal(t, http.StatusUnauthorized, sdkErr.StatusCode(), "Expecting Forbidden")
193193
})
194194
}
195195

0 commit comments

Comments
 (0)