github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle comments on upgrade tests

pull/6/head
shashidharatd 2016-11-07 12:15:13 +05:30
parent a4f614f2db
commit a779aca11d
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/cluster_upgrade.go
View File

@ -38,7 +38,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
f := framework.NewDefaultFramework("cluster-upgrade") f := framework.NewDefaultFramework("cluster-upgrade")
framework.KubeDescribe("master upgrade", func() { framework.KubeDescribe("master upgrade", func() {
It("should maintain responsive services [Feature:MasterUpgrade]", func() { It("should maintain functioning cluster during upgrade [Feature:MasterUpgrade]", func() {
cm := chaosmonkey.New(func() { cm := chaosmonkey.New(func() {
v, err := realVersion(framework.TestContext.UpgradeTarget) v, err := realVersion(framework.TestContext.UpgradeTarget)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -78,7 +78,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
cm.Do() cm.Do()
}) })
It("should maintain responsive services [Feature:ExperimentalNodeUpgrade]", func() { It("should maintain functioning cluster during upgrade [Feature:ExperimentalNodeUpgrade]", func() {
cm := chaosmonkey.New(func() { cm := chaosmonkey.New(func() {
v, err := realVersion(framework.TestContext.UpgradeTarget) v, err := realVersion(framework.TestContext.UpgradeTarget)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -120,7 +120,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
cm.Do() cm.Do()
}) })
It("should maintain responsive services [Feature:ExperimentalClusterUpgrade]", func() { It("should maintain functioning cluster during upgrade [Feature:ExperimentalClusterUpgrade]", func() {
cm := chaosmonkey.New(func() { cm := chaosmonkey.New(func() {
v, err := realVersion(framework.TestContext.UpgradeTarget) v, err := realVersion(framework.TestContext.UpgradeTarget)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -424,7 +424,7 @@ func testJobs(f *framework.Framework, sem *chaosmonkey.Semaphore, testDuringDisr
// Setup // Setup
By("setup job") By("setup job")
job := TestJobsSetup("randomlySucceedOrFail", "rand-non-local", api.RestartPolicyNever, parallelism, completions) job := TestJobsSetup(f, "randomlySucceedOrFail", "rand-non-local", api.RestartPolicyNever, parallelism, completions)
// Validate // Validate
By("validate job before upgrade") By("validate job before upgrade")
TestJobsValidate(f, job, completions) TestJobsValidate(f, job, completions)
@ -448,4 +448,5 @@ func testJobs(f *framework.Framework, sem *chaosmonkey.Semaphore, testDuringDisr
TestJobsValidate(f, job, completions) TestJobsValidate(f, job, completions)
// Teardown // Teardown
TestJobsTeardown(f, job)
} }

20
test/e2e/job.go
View File

@ -333,25 +333,31 @@ func newBool(val bool) *bool {
return p return p
} }
func TestJobsSetup(behavior, name string, rPol api.RestartPolicy, parallelism, completions int32) *batch.Job { func TestJobsSetup(f *framework.Framework, behavior, name string, rPol api.RestartPolicy, parallelism, completions int32) *batch.Job {
return newTestJob(behavior, name, rPol, parallelism, completions) job := newTestJob(behavior, name, rPol, parallelism, completions)
}
func TestJobsValidate(f *framework.Framework, job *batch.Job, completions int32) {
By("Creating a job") By("Creating a job")
job, err := createJob(f.ClientSet, f.Namespace.Name, job) job, err := createJob(f.ClientSet, f.Namespace.Name, job)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
return job
}
func TestJobsValidate(f *framework.Framework, job *batch.Job, completions int32) {
By("Ensuring job reaches completions") By("Ensuring job reaches completions")
err = waitForJobFinish(f.ClientSet, f.Namespace.Name, job.Name, completions) err := waitForJobFinish(f.ClientSet, f.Namespace.Name, job.Name, completions)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}
func TestJobsTeardown(f *framework.Framework, job *batch.Job) {
By("Delete the job") By("Delete the job")
err = deleteJob(f.ClientSet, f.Namespace.Name, job.ObjectMeta.Name) err := deleteJob(f.ClientSet, f.Namespace.Name, job.ObjectMeta.Name)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
func TestJobs(f *framework.Framework, behavior, name string, rPol api.RestartPolicy, parallelism, completions int32) { func TestJobs(f *framework.Framework, behavior, name string, rPol api.RestartPolicy, parallelism, completions int32) {
job := TestJobsSetup(behavior, name, rPol, parallelism, completions) job := TestJobsSetup(f, behavior, name, rPol, parallelism, completions)
TestJobsValidate(f, job, completions) TestJobsValidate(f, job, completions)
TestJobsTeardown(f, job)
} }