Merge pull request #123815 from mimowo/job-managed-by-test2

Follow up fix to the job status update test
kubernetes · Mar 8, 2024 · e0a142d · e0a142d
2 parents 5639f8f + acf6b50
commit e0a142d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
@@ -1049,10 +1049,9 @@
 - testname: Jobs, apply changes to status
   codename: '[sig-apps] Job should apply changes to a job status [Conformance]'
   description: Attempt to create a running Job which MUST succeed. Attempt to patch
-    the Job status to include a new start time which MUST succeed. An annotation for
-    the job that was patched MUST be found. Attempt to replace the job status with
-    a new start time which MUST succeed. Attempt to read its status sub-resource which
-    MUST succeed
+    the Job status which MUST succeed. An annotation for the job that was patched
+    MUST be found. Attempt to replace the job status with update which MUST succeed.
+    Attempt to read its status sub-resource which MUST succeed
   release: v1.24
   file: test/e2e/apps/job.go
 - testname: Ensure Pods of an Indexed Job get a unique index.

diff --git a/test/e2e/apps/job.go b/test/e2e/apps/job.go
@@ -825,10 +825,10 @@ done`}
 		Release: v1.24
 		Testname: Jobs, apply changes to status
 		Description: Attempt to create a running Job which MUST succeed.
-		Attempt to patch the Job status to include a new start time which
-		MUST succeed. An annotation for the job that was patched MUST be found.
-		Attempt to replace the job status with a new start time which MUST
-		succeed. Attempt to read its status sub-resource which MUST succeed
+		Attempt to patch the Job status which MUST succeed.
+		An annotation for the job that was patched MUST be found.
+		Attempt to replace the job status with update which MUST succeed.
+		Attempt to read its status sub-resource which MUST succeed
 	*/
 	framework.ConformanceIt("should apply changes to a job status", func(ctx context.Context) {
 
@@ -887,7 +887,7 @@ done`}
 			if err != nil {
 				return err
 			}
-			if condition := findConditionByType(patchedStatus.Status.Conditions, customConditionType); condition != nil {
+			if condition := findConditionByType(statusToUpdate.Status.Conditions, customConditionType); condition != nil {
 				condition.LastTransitionTime = now2
 			} else {
 				framework.Failf("patched object does not have the required condition %v", customConditionType)