Skip to content

Commit 9e19ed4

Browse files
EmyrkEmyrk
committed
more tests
1 parent 25aa046 commit 9e19ed4

File tree

3 files changed

+23
-34
lines changed

3 files changed

+23
-34
lines changed

‎cli/create_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func TestCreate(t *testing.T) {
302302
func prepareEchoResponses(parameters []*proto.RichParameter, presets ...*proto.Preset) *echo.Responses {
303303
return &echo.Responses{
304304
Parse: echo.ParseComplete,
305-
ProvisionPlan: []*proto.Response{
305+
ProvisionGraph: []*proto.Response{
306306
{
307307
Type: &proto.Response_Graph{
308308
Graph: &proto.GraphComplete{

‎coderd/workspacebuilds_test.go‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -556,13 +556,16 @@ func TestPatchCancelWorkspaceBuild(t *testing.T) {
556556
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
557557
user := coderdtest.CreateFirstUser(t, client)
558558
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
559-
Parse: echo.ParseComplete,
559+
Parse: echo.ParseComplete,
560+
ProvisionInit: echo.InitComplete,
561+
ProvisionGraph: echo.GraphComplete,
562+
ProvisionPlan: echo.PlanComplete,
563+
// Echo will never applying since there is no complete message
560564
ProvisionApply: []*proto.Response{{
561565
Type: &proto.Response_Log{
562566
Log: &proto.Log{},
563567
},
564568
}},
565-
ProvisionPlan: echo.PlanComplete,
566569
})
567570
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
568571
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -603,13 +606,16 @@ func TestPatchCancelWorkspaceBuild(t *testing.T) {
603606
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true, Logger: &logger})
604607
owner := coderdtest.CreateFirstUser(t, client)
605608
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, &echo.Responses{
606-
Parse: echo.ParseComplete,
609+
Parse: echo.ParseComplete,
610+
ProvisionInit: echo.InitComplete,
611+
ProvisionGraph: echo.GraphComplete,
612+
ProvisionPlan: echo.PlanComplete,
613+
// Echo will never applying
607614
ProvisionApply: []*proto.Response{{
608615
Type: &proto.Response_Log{
609616
Log: &proto.Log{},
610617
},
611618
}},
612-
ProvisionPlan: echo.PlanComplete,
613619
})
614620
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
615621
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
@@ -694,13 +700,16 @@ func TestPatchCancelWorkspaceBuild(t *testing.T) {
694700
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
695701
user := coderdtest.CreateFirstUser(t, client)
696702
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
697-
Parse: echo.ParseComplete,
703+
Parse: echo.ParseComplete,
704+
ProvisionInit: echo.InitComplete,
705+
ProvisionGraph: echo.GraphComplete,
706+
ProvisionPlan: echo.PlanComplete,
707+
// Echo will never applying
698708
ProvisionApply: []*proto.Response{{
699709
Type: &proto.Response_Log{
700710
Log: &proto.Log{},
701711
},
702712
}},
703-
ProvisionPlan: echo.PlanComplete,
704713
})
705714
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
706715
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -791,13 +800,16 @@ func TestPatchCancelWorkspaceBuild(t *testing.T) {
791800
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
792801
user := coderdtest.CreateFirstUser(t, client)
793802
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
794-
Parse: echo.ParseComplete,
803+
Parse: echo.ParseComplete,
804+
ProvisionInit: echo.InitComplete,
805+
ProvisionGraph: echo.GraphComplete,
806+
ProvisionPlan: echo.PlanComplete,
807+
// Echo will never applying
795808
ProvisionApply: []*proto.Response{{
796809
Type: &proto.Response_Log{
797810
Log: &proto.Log{},
798811
},
799812
}},
800-
ProvisionPlan: echo.PlanComplete,
801813
})
802814
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
803815
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -1483,28 +1495,6 @@ func TestPostWorkspaceBuild(t *testing.T) {
14831495
require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
14841496
})
14851497

1486-
t.Run("TemplateVersionFailedImport", func(t *testing.T) {
1487-
t.Parallel()
1488-
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
1489-
user := coderdtest.CreateFirstUser(t, client)
1490-
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
1491-
ProvisionApply: []*proto.Response{{}},
1492-
})
1493-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
1494-
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
1495-
1496-
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
1497-
defer cancel()
1498-
1499-
_, err := client.CreateWorkspace(ctx, user.OrganizationID, codersdk.Me, codersdk.CreateWorkspaceRequest{
1500-
TemplateID: template.ID,
1501-
Name: "workspace",
1502-
})
1503-
var apiErr *codersdk.Error
1504-
require.ErrorAs(t, err, &apiErr)
1505-
require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
1506-
})
1507-
15081498
t.Run("AlreadyActive", func(t *testing.T) {
15091499
t.Parallel()
15101500
client, closer := coderdtest.NewWithProvisionerCloser(t, nil)

‎provisioner/terraform/provision_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,17 +352,16 @@ func TestProvision_TextFileBusy(t *testing.T) {
352352
})
353353

354354
sess := configure(ctx, t, api, &proto.Config{})
355-
_ = initDo(t, sess, testutil.CreateTar(t, nil))
356355

357-
err = sendPlan(sess, proto.WorkspaceTransition_START)
356+
err = sendInit(sess, testutil.CreateTar(t, nil))
358357
require.NoError(t, err)
359358

360359
found := false
361360
for {
362361
msg, err := sess.Recv()
363362
require.NoError(t, err)
364363

365-
if c := msg.GetPlan(); c != nil {
364+
if c := msg.GetInit(); c != nil {
366365
require.Contains(t, c.Error, "exit status 1")
367366
found = true
368367
break

0 commit comments

Comments
 (0)