Skip to content

Commit 369031d

Browse files
authored
Delete all AppWrappers in namespace on AfterEach. (#8083)
1 parent 9841c3d commit 369031d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

test/e2e/tas/appwrapper_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ var _ = ginkgo.Describe("TopologyAwareScheduling for AppWrapper", func() {
6868
util.CreateLocalQueuesAndWaitForActive(ctx, k8sClient, localQueue)
6969
})
7070
ginkgo.AfterEach(func() {
71-
gomega.Expect(util.DeleteAllAppWrappersInNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
7271
gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
7372
util.ExpectObjectToBeDeleted(ctx, k8sClient, clusterQueue, true)
7473
util.ExpectObjectToBeDeleted(ctx, k8sClient, tasFlavor, true)

test/util/util.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ func DeleteNamespace(ctx context.Context, c client.Client, ns *corev1.Namespace)
120120
if ns == nil {
121121
return nil
122122
}
123+
if err := DeleteAllAppWrappersInNamespace(ctx, c, ns); err != nil {
124+
return err
125+
}
123126
if err := DeleteAllJobSetsInNamespace(ctx, c, ns); err != nil {
124127
return err
125128
}

0 commit comments

Comments
 (0)