Handle comments on upgrade tests

test/e2e/cluster_upgrade.go

@@ -38,7 +38,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
 	f := framework.NewDefaultFramework("cluster-upgrade")
 
 	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() {
 				v, err := realVersion(framework.TestContext.UpgradeTarget)
 				framework.ExpectNoError(err)
@@ -78,7 +78,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
 			cm.Do()
 		})
 
-		It("should maintain responsive services [Feature:ExperimentalNodeUpgrade]", func() {
+		It("should maintain functioning cluster during upgrade [Feature:ExperimentalNodeUpgrade]", func() {
 			cm := chaosmonkey.New(func() {
 				v, err := realVersion(framework.TestContext.UpgradeTarget)
 				framework.ExpectNoError(err)
@@ -120,7 +120,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
 			cm.Do()
 		})
 
-		It("should maintain responsive services [Feature:ExperimentalClusterUpgrade]", func() {
+		It("should maintain functioning cluster during upgrade [Feature:ExperimentalClusterUpgrade]", func() {
 			cm := chaosmonkey.New(func() {
 				v, err := realVersion(framework.TestContext.UpgradeTarget)
 				framework.ExpectNoError(err)
@@ -424,7 +424,7 @@ func testJobs(f *framework.Framework, sem *chaosmonkey.Semaphore, testDuringDisr
 
 	// Setup
 	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
 	By("validate job before upgrade")
 	TestJobsValidate(f, job, completions)
@@ -448,4 +448,5 @@ func testJobs(f *framework.Framework, sem *chaosmonkey.Semaphore, testDuringDisr
 	TestJobsValidate(f, job, completions)
 
 	// Teardown
+	TestJobsTeardown(f, job)
 }

test/e2e/job.go

@@ -333,25 +333,31 @@ func newBool(val bool) *bool {
 	return p
 }
 
-func TestJobsSetup(behavior, name string, rPol api.RestartPolicy, parallelism, completions int32) *batch.Job {
-	return newTestJob(behavior, name, rPol, parallelism, completions)
-}
+func TestJobsSetup(f *framework.Framework, behavior, name string, rPol api.RestartPolicy, parallelism, completions int32) *batch.Job {
+	job := newTestJob(behavior, name, rPol, parallelism, completions)
 
-func TestJobsValidate(f *framework.Framework, job *batch.Job, completions int32) {
 	By("Creating a job")
 	job, err := createJob(f.ClientSet, f.Namespace.Name, job)
 	Expect(err).NotTo(HaveOccurred())
 
+	return job
+}
+
+func TestJobsValidate(f *framework.Framework, job *batch.Job, completions int32) {
 	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())
 
+}
+
+func TestJobsTeardown(f *framework.Framework, job *batch.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())
 }
 
 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)
+	TestJobsTeardown(f, job)
 }