[ws-manager-mk2] Update tests with content readiness

Author: WVerlaek

components/ws-manager-mk2/controllers/workspace_controller_test.go

@@ -119,11 +119,28 @@ var _ = Describe("WorkspaceController", func() {
 			})
 		})
 
+		It("should not take a backup if content init did not happen", func() {
+			ws := newWorkspace(uuid.NewString(), "default")
+			m := collectMetricCounts(wsMetrics, ws)
+			pod := createWorkspaceExpectPod(ws)
+
+			requestStop(ws)
+
+			// No content init, expect cleanup without backup.
+			expectWorkspaceCleanup(ws, pod)
+
+			expectMetricsDelta(m, collectMetricCounts(wsMetrics, ws), metricCounts{
+				stops: 1,
+			})
+		})
+
 		It("should handle backup failure", func() {
 			ws := newWorkspace(uuid.NewString(), "default")
 			m := collectMetricCounts(wsMetrics, ws)
 			pod := createWorkspaceExpectPod(ws)
 
+			markContentReady(ws)
+
 			// Stop the workspace.
 			requestStop(ws)
 
@@ -134,6 +151,7 @@ var _ = Describe("WorkspaceController", func() {
 			expectWorkspaceCleanup(ws, pod)
 
 			expectMetricsDelta(m, collectMetricCounts(wsMetrics, ws), metricCounts{
+				restores:       1,
 				backups:        1,
 				backupFailures: 1,
 				stops:          1,
@@ -145,6 +163,8 @@ var _ = Describe("WorkspaceController", func() {
 			m := collectMetricCounts(wsMetrics, ws)
 			pod := createWorkspaceExpectPod(ws)
 
+			markContentReady(ws)
+
 			// Update Pod with failed exit status.
 			updateObjWithRetries(k8sClient, pod, true, func(pod *corev1.Pod) {
 				pod.Status.ContainerStatuses = append(pod.Status.ContainerStatuses, corev1.ContainerStatus{
@@ -165,6 +185,7 @@ var _ = Describe("WorkspaceController", func() {
 			expectWorkspaceCleanup(ws, pod)
 
 			expectMetricsDelta(m, collectMetricCounts(wsMetrics, ws), metricCounts{
+				restores:      1,
 				startFailures: 1,
 				stops:         1,
 				backups:       1,
@@ -176,6 +197,8 @@ var _ = Describe("WorkspaceController", func() {
 			m := collectMetricCounts(wsMetrics, ws)
 			pod := createWorkspaceExpectPod(ws)
 
+			markContentReady(ws)
+
 			By("adding Timeout condition")
 			updateObjWithRetries(k8sClient, ws, true, func(ws *workspacev1.Workspace) {
 				ws.Status.Conditions = wsk8s.AddUniqueCondition(ws.Status.Conditions, metav1.Condition{
@@ -190,8 +213,9 @@ var _ = Describe("WorkspaceController", func() {
 			expectWorkspaceCleanup(ws, pod)
 
 			expectMetricsDelta(m, collectMetricCounts(wsMetrics, ws), metricCounts{
-				stops:   1,
-				backups: 1,
+				restores: 1,
+				stops:    1,
+				backups:  1,
 			})
 		})
 
@@ -200,6 +224,8 @@ var _ = Describe("WorkspaceController", func() {
 			m := collectMetricCounts(wsMetrics, ws)
 			pod := createWorkspaceExpectPod(ws)
 
+			markContentReady(ws)
+
 			// Update Pod with stop and abort conditions.
 			updateObjWithRetries(k8sClient, ws, true, func(ws *workspacev1.Workspace) {
 				ws.Status.Conditions = wsk8s.AddUniqueCondition(ws.Status.Conditions, metav1.Condition{
@@ -218,7 +244,8 @@ var _ = Describe("WorkspaceController", func() {
 			expectWorkspaceCleanup(ws, pod)
 
 			expectMetricsDelta(m, collectMetricCounts(wsMetrics, ws), metricCounts{
-				stops: 1,
+				restores: 1,
+				stops:    1,
 			})
 		})
 
@@ -227,6 +254,8 @@ var _ = Describe("WorkspaceController", func() {
 			m := collectMetricCounts(wsMetrics, ws)
 			pod := createWorkspaceExpectPod(ws)
 
+			markContentReady(ws)
+
 			Expect(k8sClient.Delete(ctx, ws)).To(Succeed())
 
 			expectPhaseEventually(ws, workspacev1.WorkspacePhaseStopping)
@@ -236,8 +265,9 @@ var _ = Describe("WorkspaceController", func() {
 			expectWorkspaceCleanup(ws, pod)
 
 			expectMetricsDelta(m, collectMetricCounts(wsMetrics, ws), metricCounts{
-				stops:   1,
-				backups: 1,
+				restores: 1,
+				stops:    1,
+				backups:  1,
 			})
 		})
 	})