Skip to content

Commit b89314c

Browse files
dmatch01dmatch01
committed
Fixed cleanup of e2e test to work properly.
Signed-off-by: dmatch01 <darroyo@us.ibm.com>
1 parent ebaf1f7 commit b89314c

File tree

2 files changed

+70
-82
lines changed

2 files changed

+70
-82
lines changed

‎test/e2e/queue.go‎

Lines changed: 55 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -32,97 +32,84 @@ var _ = Describe("AppWrapper E2E Test", func() {
3232
fmt.Fprintf(os.Stdout, "[e2e] MCAD CPU Accounting Test - Started.\n")
3333

3434
context := initTestContext()
35-
defer cleanupTestContext(context)
35+
var appwrappers []*arbv1.AppWrapper
36+
appwrappersPtr := &appwrappers
37+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
3638

3739
// This should fill up the worker node and most of the master node
3840
aw := createDeploymentAWwith550CPU(context, "aw-deployment-2-550cpu")
41+
appwrappers = append(appwrappers, aw)
3942

4043
err := waitAWPodsReady(context, aw)
4144
Expect(err).NotTo(HaveOccurred())
4245

4346
// This should fill up the master node
4447
aw2 := createDeploymentAWwith350CPU(context, "aw-deployment-2-350cpu")
48+
appwrappers = append(appwrappers, aw2)
4549

4650
// Using quite mode due to creating of pods in earlier step.
4751
err = waitAWReadyQuiet(context, aw2)
4852
Expect(err).NotTo(HaveOccurred())
4953

50-
var appwrappers []*arbv1.AppWrapper
51-
appwrappers = append(appwrappers, aw)
52-
appwrappers = append(appwrappers, aw2)
53-
cleanupTestObjects(context, appwrappers)
5454
})
5555

5656
It("Create AppWrapper - StatefulSet Only - 2 Pods", func() {
5757
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - StatefulSet Only - 2 Pods - Started.\n")
5858

5959
context := initTestContext()
60-
defer cleanupTestContext(context)
60+
var appwrappers []*arbv1.AppWrapper
61+
appwrappersPtr := &appwrappers
62+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
6163

6264
aw := createStatefulSetAW(context, "aw-statefulset-2")
65+
appwrappers = append(appwrappers, aw)
6366

6467
err := waitAWPodsReady(context, aw)
65-
6668
Expect(err).NotTo(HaveOccurred())
67-
68-
var appwrappers []*arbv1.AppWrapper
69-
appwrappers = append(appwrappers, aw)
70-
cleanupTestObjects(context, appwrappers)
7169
})
7270

7371
It("Create AppWrapper - Generic StatefulSet Only - 2 Pods", func() {
7472
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Generic StatefulSet Only - 2 Pods - Started.\n")
7573

7674
context := initTestContext()
77-
defer cleanupTestContext(context)
75+
var appwrappers []*arbv1.AppWrapper
76+
appwrappersPtr := &appwrappers
77+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
7878

7979
aw := createGenericStatefulSetAW(context, "aw-generic-statefulset-2")
80+
appwrappers = append(appwrappers, aw)
8081

8182
err := waitAWPodsReady(context, aw)
82-
8383
Expect(err).NotTo(HaveOccurred())
84-
85-
var appwrappers []*arbv1.AppWrapper
86-
appwrappers = append(appwrappers, aw)
87-
cleanupTestObjects(context, appwrappers)
8884
})
8985

9086
It("Create AppWrapper - Deployment Only - 3 Pods", func() {
9187
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Deployment Only 3 Pods - Started.\n")
9288
context := initTestContext()
93-
defer cleanupTestContext(context)
89+
var appwrappers []*arbv1.AppWrapper
90+
appwrappersPtr := &appwrappers
91+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
9492

9593
aw := createDeploymentAW(context, "aw-deployment-3")
94+
appwrappers = append(appwrappers, aw)
95+
9696
fmt.Fprintf(os.Stdout, "[e2e] Awaiting %d pods running for AW %s.\n", aw.Spec.SchedSpec.MinAvailable, aw.Name)
9797
err := waitAWPodsReady(context, aw)
9898
Expect(err).NotTo(HaveOccurred())
99-
100-
// Now delete the appwrapper
101-
pods := getPodsOfAppWrapper(context, aw)
102-
fmt.Fprintf(os.Stdout, "[e2e] Deleting AW %s.\n", aw.Name)
103-
err = deleteAppWrapper(context, "aw-deployment-3")
104-
Expect(err).NotTo(HaveOccurred())
105-
106-
// Wait for the pods of the deleted the appwrapper to be destroyed
107-
fmt.Fprintf(os.Stdout, "[e2e] Awaiting %d pods to be deleted for AW %s.\n", aw.Spec.SchedSpec.MinAvailable, aw.Name)
108-
err = waitAWDeleted(context, aw, pods)
109-
Expect(err).NotTo(HaveOccurred())
11099
})
111100

112101
It("Create AppWrapper - Generic Deployment Only - 3 pods", func() {
113102
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Generic Deployment Only - 3 pods - Started.\n")
114103
context := initTestContext()
115-
defer cleanupTestContext(context)
104+
var appwrappers []*arbv1.AppWrapper
105+
appwrappersPtr := &appwrappers
106+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
116107

117108
aw := createGenericDeploymentAW(context, "aw-generic-deployment-3")
109+
appwrappers = append(appwrappers, aw)
118110

119111
err := waitAWPodsReady(context, aw)
120112
Expect(err).NotTo(HaveOccurred())
121-
122-
var appwrappers []*arbv1.AppWrapper
123-
appwrappers = append(appwrappers, aw)
124-
cleanupTestObjects(context, appwrappers)
125-
126113
})
127114

128115
//NOTE: Recommend this test not to be the last test in the test suite it may pass
@@ -132,137 +119,123 @@ var _ = Describe("AppWrapper E2E Test", func() {
132119
It("Create AppWrapper- Bad PodTemplate", func() {
133120
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper- Bad PodTemplate - Started.\n")
134121
context := initTestContext()
135-
defer cleanupTestContext(context)
122+
var appwrappers []*arbv1.AppWrapper
123+
appwrappersPtr := &appwrappers
124+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
136125

137126
aw := createBadPodTemplateAW(context, "aw-bad-podtemplate-2")
127+
appwrappers = append(appwrappers, aw)
138128

139129
err := waitAWPodsReady(context, aw)
140-
141130
Expect(err).To(HaveOccurred())
142-
143-
var appwrappers []*arbv1.AppWrapper
144-
appwrappers = append(appwrappers, aw)
145-
cleanupTestObjects(context, appwrappers)
146131
})
147132

148133
It("Create AppWrapper - Bad Generic PodTemplate Only", func() {
149134
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Bad Generic PodTemplate Only - Started.\n")
150135
context := initTestContext()
151-
defer cleanupTestContext(context)
136+
var appwrappers []*arbv1.AppWrapper
137+
appwrappersPtr := &appwrappers
138+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
152139

153140
aw := createBadGenericPodTemplateAW(context, "aw-generic-podtemplate-2")
141+
appwrappers = append(appwrappers, aw)
154142

155143
err := waitAWPodsReady(context, aw)
156-
157144
Expect(err).To(HaveOccurred())
158-
159-
var appwrappers []*arbv1.AppWrapper
160-
appwrappers = append(appwrappers, aw)
161-
cleanupTestObjects(context, appwrappers)
162145
})
163146

164147
It("Create AppWrapper - PodTemplate Only - 2 Pods", func() {
165148
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - PodTemplate Only - 2 Pods - Started.\n")
166149
context := initTestContext()
167-
defer cleanupTestContext(context)
150+
var appwrappers []*arbv1.AppWrapper
151+
appwrappersPtr := &appwrappers
152+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
168153

169154
aw := createPodTemplateAW(context, "aw-podtemplate-2")
155+
appwrappers = append(appwrappers, aw)
170156

171157
err := waitAWPodsReady(context, aw)
172-
173158
Expect(err).NotTo(HaveOccurred())
174-
175-
var appwrappers []*arbv1.AppWrapper
176-
appwrappers = append(appwrappers, aw)
177-
cleanupTestObjects(context, appwrappers)
178159
})
179160

180161
It("Create AppWrapper - Generic Pod Only - 1 Pod", func() {
181162
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Generic Pod Only - 1 Pod - Started.\n")
182163
context := initTestContext()
183-
defer cleanupTestContext(context)
164+
var appwrappers []*arbv1.AppWrapper
165+
appwrappersPtr := &appwrappers
166+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
184167

185168
aw := createGenericPodAW(context, "aw-generic-pod-1")
169+
appwrappers = append(appwrappers, aw)
186170

187171
err := waitAWPodsReady(context, aw)
188-
189172
Expect(err).NotTo(HaveOccurred())
190-
191-
var appwrappers []*arbv1.AppWrapper
192-
appwrappers = append(appwrappers, aw)
193-
cleanupTestObjects(context, appwrappers)
194173
})
195174

196175
It("Create AppWrapper - Bad Generic Pod Only", func() {
197176
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Bad Generic Pod Only - Started.\n")
198177
context := initTestContext()
199-
defer cleanupTestContext(context)
178+
var appwrappers []*arbv1.AppWrapper
179+
appwrappersPtr := &appwrappers
180+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
200181

201182
aw := createBadGenericPodAW(context, "aw-bad-generic-pod-1")
183+
appwrappers = append(appwrappers, aw)
202184

203185
err := waitAWPodsReady(context, aw)
204-
205186
Expect(err).To(HaveOccurred())
206187

207-
var appwrappers []*arbv1.AppWrapper
208-
appwrappers = append(appwrappers, aw)
209-
cleanupTestObjects(context, appwrappers)
210188
})
211189

212190
It("Create AppWrapper - Namespace Only - 0 Pods", func() {
213191
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Namespace Only - 0 Pods - Started.\n")
214192
context := initTestContext()
215-
defer cleanupTestContext(context)
193+
var appwrappers []*arbv1.AppWrapper
194+
appwrappersPtr := &appwrappers
195+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
216196

217197
aw := createNamespaceAW(context, "aw-namespace-0")
198+
appwrappers = append(appwrappers, aw)
218199

219200
err := waitAWNonComputeResourceActive(context, aw)
220-
221201
Expect(err).NotTo(HaveOccurred())
222-
223-
var appwrappers []*arbv1.AppWrapper
224-
appwrappers = append(appwrappers, aw)
225-
cleanupTestObjects(context, appwrappers)
226202
})
227203

228204
It("Create AppWrapper - Generic Namespace Only - 0 Pods", func() {
229205
fmt.Fprintf(os.Stdout, "[e2e] Create AppWrapper - Generic Namespace Only - 0 Pods - Started.\n")
230206
context := initTestContext()
231-
defer cleanupTestContext(context)
207+
var appwrappers []*arbv1.AppWrapper
208+
appwrappersPtr := &appwrappers
209+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
232210

233211
aw := createGenericNamespaceAW(context, "aw-generic-namespace-0")
212+
appwrappers = append(appwrappers, aw)
234213

235214
err := waitAWNonComputeResourceActive(context, aw)
236-
237215
Expect(err).NotTo(HaveOccurred())
238216

239-
var appwrappers []*arbv1.AppWrapper
240-
appwrappers = append(appwrappers, aw)
241-
cleanupTestObjects(context, appwrappers)
242217
})
243218

244219
It("MCAD CPU Accounting Fail Test", func() {
245220
fmt.Fprintf(os.Stdout, "[e2e] MCAD CPU Accounting Fail Test - Started.\n")
246221
context := initTestContext()
247-
defer cleanupTestContext(context)
222+
var appwrappers []*arbv1.AppWrapper
223+
appwrappersPtr := &appwrappers
224+
defer cleanupTestObjectsPtr(context, appwrappersPtr)
248225

249226
// This should fill up the worker node and most of the master node
250227
aw := createDeploymentAWwith550CPU(context, "aw-deployment-2-550cpu")
228+
appwrappers = append(appwrappers, aw)
251229

252230
err := waitAWPodsReady(context, aw)
253231
Expect(err).NotTo(HaveOccurred())
254232

255233
// This should not fit on cluster
256234
aw2 := createDeploymentAWwith351CPU(context, "aw-deployment-2-351cpu")
235+
appwrappers = append(appwrappers, aw2)
257236

258237
err = waitAWReadyQuiet(context, aw2)
259238
Expect(err).To(HaveOccurred())
260-
261-
var appwrappers []*arbv1.AppWrapper
262-
appwrappers = append(appwrappers, aw)
263-
appwrappers = append(appwrappers, aw2)
264-
cleanupTestObjects(context, appwrappers)
265-
266239
})
267240

268241
It("Create AppWrapper - Generic 100 Deployment Only - 2 pods each", func() {

‎test/e2e/util.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,21 @@ func awStatePhase(ctx *context, aw *arbv1.AppWrapper, phase []arbv1.AppWrapperSt
365365
}
366366
}
367367

368+
369+
func cleanupTestObjectsPtr(context *context, appwrappersPtr *[]*arbv1.AppWrapper) {
370+
if appwrappersPtr == nil {
371+
fmt.Fprintf(os.Stdout, "[cleanupTestObjectsPtr] No AppWrappers to cleanup.\n")
372+
} else {
373+
cleanupTestObjects(context, *appwrappersPtr)
374+
}
375+
}
376+
368377
func cleanupTestObjects(context *context, appwrappers []*arbv1.AppWrapper) {
378+
if appwrappers == nil {
379+
fmt.Fprintf(os.Stdout, "[cleanupTestObjects] No AppWrappers to cleanup.\n")
380+
return
381+
}
382+
369383
for _, aw := range appwrappers {
370384
//context.karclient.ArbV1().AppWrappers(context.namespace).Delete(aw.Name, &metav1.DeleteOptions{PropagationPolicy: &foreground})
371385

@@ -399,6 +413,7 @@ func cleanupTestObjects(context *context, appwrappers []*arbv1.AppWrapper) {
399413
}
400414
Expect(err).NotTo(HaveOccurred())
401415
}
416+
cleanupTestContext(context)
402417
}
403418

404419
func awPodPhase(ctx *context, aw *arbv1.AppWrapper, phase []v1.PodPhase, taskNum int, quite bool) wait.ConditionFunc {

0 commit comments

Comments
 (0)