add tests for start/restart

coder · sreya · Oct 19, 2023 · Oct 18, 2023 · Oct 19, 2023 · Oct 19, 2023
commit 202d29ab046d6a19e739e03c32aac052e2a0bf75
diff --git a/cli/restart.go b/cli/restart.go
@@ -110,6 +110,7 @@ func (r *RootCmd) restart() *clibase.Cmd {
 			build, err = client.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{
 				Transition:          codersdk.WorkspaceTransitionStart,
 				RichParameterValues: buildParameters,
+				TemplateVersionID:   versionID,
 			})
 			if err != nil {
 				return err

diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -610,7 +610,7 @@ func CreateAnotherUserMutators(t testing.TB, client *codersdk.Client, organizati
 func createAnotherUserRetry(t testing.TB, client *codersdk.Client, organizationID uuid.UUID, retries int, roles []string, mutators ...func(r *codersdk.CreateUserRequest)) (*codersdk.Client, codersdk.User) {
 	req := codersdk.CreateUserRequest{
 		Email:          namesgenerator.GetRandomName(10) + "@coder.com",
-		Username:       randomUsername(t),
+		Username:       RandomUsername(t),
 		Password:       "SomeSecurePassword!",
 		OrganizationID: organizationID,
 	}
@@ -744,7 +744,7 @@ func CreateWorkspaceBuild(
 // compatibility with testing. The name assigned is randomly generated.
 func CreateTemplate(t testing.TB, client *codersdk.Client, organization uuid.UUID, version uuid.UUID, mutators ...func(*codersdk.CreateTemplateRequest)) codersdk.Template {
 	req := codersdk.CreateTemplateRequest{
-		Name:      randomUsername(t),
+		Name:      RandomUsername(t),
 		VersionID: version,
 	}
 	for _, mut := range mutators {
@@ -906,7 +906,7 @@ func CreateWorkspace(t testing.TB, client *codersdk.Client, organization uuid.UU
 	t.Helper()
 	req := codersdk.CreateWorkspaceRequest{
 		TemplateID:        templateID,
-		Name:              randomUsername(t),
+		Name:              RandomUsername(t),
 		AutostartSchedule: ptr.Ref("CRON_TZ=US/Central 30 9 * * 1-5"),
 		TTLMillis:         ptr.Ref((8 * time.Hour).Milliseconds()),
 		AutomaticUpdates:  codersdk.AutomaticUpdatesNever,
@@ -1170,7 +1170,7 @@ func NewAzureInstanceIdentity(t testing.TB, instanceID string) (x509.VerifyOptio
 		}
 }
 
-func randomUsername(t testing.TB) string {
+func RandomUsername(t testing.TB) string {
 	suffix, err := cryptorand.String(3)
 	require.NoError(t, err)
 	suffix = "-" + suffix

diff --git a/enterprise/cli/start_test.go b/enterprise/cli/start_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/coder/coder/v2/testutil"
 )
 
+// TestStart also tests restart since the tests are virtually identical.
 func TestStart(t *testing.T) {
 	t.Parallel()
 
@@ -131,34 +132,45 @@ func TestStart(t *testing.T) {
 			},
 		}
 
-		for _, c := range cases {
-			t.Run(c.Name, func(t *testing.T) {
-				// Instantiate a new context for each subtest since
-				// they can potentially be lengthy.
-				ctx = testutil.Context(t, testutil.WaitMedium)
-				// Create the workspace using the admin since we want
-				// to force the old version.
-				ws, err := ownerClient.CreateWorkspace(ctx, owner.OrganizationID, c.WorkspaceOwner.String(), codersdk.CreateWorkspaceRequest{
-					TemplateVersionID: oldVersion.ID,
-					Name:              "abc123",
-					AutomaticUpdates:  codersdk.AutomaticUpdatesNever,
-				})
-				require.NoError(t, err)
-				coderdtest.AwaitWorkspaceBuildJobCompleted(t, c.Client, ws.LatestBuild.ID)
-				// Stop the workspace so that we can start it.
-				coderdtest.MustTransitionWorkspace(t, c.Client, ws.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop, func(req *codersdk.CreateWorkspaceBuildRequest) {
-					req.TemplateVersionID = oldVersion.ID
-				})
-
-				// Start the workspace. Every test permutation should
-				// pass.
-				inv, conf := newCLI(t, "start", ws.Name)
-				clitest.SetupConfig(t, c.Client, conf)
-				err = inv.Run()
-				require.NoError(t, err)
-
-				ws = coderdtest.MustWorkspace(t, c.Client, ws.ID)
-				require.Equal(t, c.ExpectedVersion, ws.LatestBuild.TemplateVersionID)
+		for _, cmd := range []string{"start", "restart"} {
+			cmd := cmd
+			t.Run(cmd, func(t *testing.T) {
+				t.Parallel()
+				for _, c := range cases {
+					c := c
+					t.Run(c.Name, func(t *testing.T) {
+						t.Parallel()
+
+						// Instantiate a new context for each subtest since
+						// they can potentially be lengthy.
+						ctx = testutil.Context(t, testutil.WaitMedium)
+						// Create the workspace using the admin since we want
+						// to force the old version.
+						ws, err := ownerClient.CreateWorkspace(ctx, owner.OrganizationID, c.WorkspaceOwner.String(), codersdk.CreateWorkspaceRequest{
+							TemplateVersionID: oldVersion.ID,
+							Name:              coderdtest.RandomUsername(t),
+							AutomaticUpdates:  codersdk.AutomaticUpdatesNever,
+						})
+						require.NoError(t, err)
+						coderdtest.AwaitWorkspaceBuildJobCompleted(t, c.Client, ws.LatestBuild.ID)
+
+						if cmd == "start" {
+							// Stop the workspace so that we can start it.
+							coderdtest.MustTransitionWorkspace(t, c.Client, ws.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop, func(req *codersdk.CreateWorkspaceBuildRequest) {
+								req.TemplateVersionID = oldVersion.ID
+							})
+						}
+						// Start the workspace. Every test permutation should
+						// pass.
+						inv, conf := newCLI(t, cmd, ws.Name, "-y")
+						clitest.SetupConfig(t, c.Client, conf)
+						err = inv.Run()
+						require.NoError(t, err)
+
+						ws = coderdtest.MustWorkspace(t, c.Client, ws.ID)
+						require.Equal(t, c.ExpectedVersion, ws.LatestBuild.TemplateVersionID)
+					})
+				}
 			})
 		}
 	})