github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 22:33:34 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Follow up fix to the job status update test
This commit is contained in:
Kubernetes Prow Robot 2024-03-08 08:00:35 -08:00 committed by GitHub
commit e0a142dc5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/conformance/testdata/conformance.yaml vendored
View File

@ -1049,10 +1049,9 @@
- testname: Jobs, apply changes to status - testname: Jobs, apply changes to status
codename: '[sig-apps] Job should apply changes to a job status [Conformance]' 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 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 status which MUST succeed. An annotation for the job that was patched
the job that was patched MUST be found. Attempt to replace the job status with MUST be found. Attempt to replace the job status with update which MUST succeed.
a new start time which MUST succeed. Attempt to read its status sub-resource which Attempt to read its status sub-resource which MUST succeed
MUST succeed
release: v1.24 release: v1.24
file: test/e2e/apps/job.go file: test/e2e/apps/job.go
- testname: Ensure Pods of an Indexed Job get a unique index. - testname: Ensure Pods of an Indexed Job get a unique index.

10
test/e2e/apps/job.go
View File

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