github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Modify alias of e2e/framework/job to e2ejob

Browse Source
This commit is contained in:
toyoda
2020-01-17 10:56:05 +09:00
parent 2ea483b17e
commit 0c12ae5240
10 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/node/ttlafterfinished.go
View File

@@ -27,7 +27,7 @@ import (
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/pkg/util/slice"
"k8s.io/kubernetes/test/e2e/framework"
jobutil "k8s.io/kubernetes/test/e2e/framework/job"
e2ejob "k8s.io/kubernetes/test/e2e/framework/job"
"github.com/onsi/ginkgo"
)
@@ -57,9 +57,9 @@ func cleanupJob(f *framework.Framework, job *batchv1.Job) {
}
_, err := updateJobWithRetries(c, ns, job.Name, removeFinalizerFunc)
framework.ExpectNoError(err)
jobutil.WaitForJobGone(c, ns, job.Name, wait.ForeverTestTimeout)
e2ejob.WaitForJobGone(c, ns, job.Name, wait.ForeverTestTimeout)
err = jobutil.WaitForAllJobPodsGone(c, ns, job.Name)
err = e2ejob.WaitForAllJobPodsGone(c, ns, job.Name)
framework.ExpectNoError(err)
}
@@ -72,17 +72,17 @@ func testFinishedJob(f *framework.Framework) {
backoffLimit := int32(2)
ttl := int32(10)
job := jobutil.NewTestJob("randomlySucceedOrFail", "rand-non-local", v1.RestartPolicyNever, parallelism, completions, nil, backoffLimit)
job := e2ejob.NewTestJob("randomlySucceedOrFail", "rand-non-local", v1.RestartPolicyNever, parallelism, completions, nil, backoffLimit)
job.Spec.TTLSecondsAfterFinished = &ttl
job.ObjectMeta.Finalizers = []string{dummyFinalizer}
defer cleanupJob(f, job)
framework.Logf("Create a Job %s/%s with TTL", ns, job.Name)
job, err := jobutil.CreateJob(c, ns, job)
job, err := e2ejob.CreateJob(c, ns, job)
framework.ExpectNoError(err)
framework.Logf("Wait for the Job to finish")
err = jobutil.WaitForJobFinish(c, ns, job.Name)
err = e2ejob.WaitForJobFinish(c, ns, job.Name)
framework.ExpectNoError(err)
framework.Logf("Wait for TTL after finished controller to delete the Job")
@@ -90,7 +90,7 @@ func testFinishedJob(f *framework.Framework) {
framework.ExpectNoError(err)
framework.Logf("Check Job's deletionTimestamp and compare with the time when the Job finished")
job, err = jobutil.GetJob(c, ns, job.Name)
job, err = e2ejob.GetJob(c, ns, job.Name)
framework.ExpectNoError(err)
finishTime := FinishTime(job)
finishTimeUTC := finishTime.UTC()