Skip to content

Commit 7548c69

Browse files
adityadtu5wilfred-s
authored andcommitted
[YUNIKORN-3285] Quota preemption delay inheritance test fix (#1031)
Eanbling skipped test for delay inheritance based on the fix of the inheritance code in yunikorn-core. Closes: #1031 Signed-off-by: Wilfred Spiegelenburg <wilfreds@apache.org>
1 parent cad899d commit 7548c69

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module github.com/apache/yunikorn-k8shim
2121
go 1.25.0
2222

2323
require (
24-
github.com/apache/yunikorn-core v0.0.0-20260529102538-fad16fdb6992
24+
github.com/apache/yunikorn-core v0.0.0-20260605065500-fae6e256cd5c
2525
github.com/apache/yunikorn-scheduler-interface v0.0.0-20260528033204-c474acff6d53
2626
github.com/google/go-cmp v0.7.0
2727
github.com/google/uuid v1.6.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e h1:4dAU9FXIyQktp
1010
github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
1111
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
1212
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
13-
github.com/apache/yunikorn-core v0.0.0-20260529102538-fad16fdb6992 h1:eOO7ADGZwpv8yc/bNMA2TQFq1izvzuisZdjj+POHHj4=
14-
github.com/apache/yunikorn-core v0.0.0-20260529102538-fad16fdb6992/go.mod h1:yxn4stqkqgiSNYqOyulBHf9IgyTBM+rFrzWcyicueKU=
13+
github.com/apache/yunikorn-core v0.0.0-20260605065500-fae6e256cd5c h1:iuShQ3op12fL+jQ420ZQLsgyDp/1L1/ygi9ZG8awvko=
14+
github.com/apache/yunikorn-core v0.0.0-20260605065500-fae6e256cd5c/go.mod h1:yxn4stqkqgiSNYqOyulBHf9IgyTBM+rFrzWcyicueKU=
1515
github.com/apache/yunikorn-scheduler-interface v0.0.0-20260528033204-c474acff6d53 h1:zodKoODatR57zSGoQGdQ8EZjJgQqy9nh5/yxmI9hWpI=
1616
github.com/apache/yunikorn-scheduler-interface v0.0.0-20260528033204-c474acff6d53/go.mod h1:XygReHrRd3TtfNS3uVtRQI0sCOfprcLUfhlmv/LdCmk=
1717
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=

test/e2e/quota-preemption/quota_preemption_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ var _ = ginkgo.Describe("QuotaPreemption", func() {
294294
}, 5*time.Second, time.Second).Should(gomega.Succeed())
295295
})
296296

297-
ginkgo.PIt("Needs Investigation - Quota_Preemption_Delay_Inherited_From_Parent", func() {
297+
ginkgo.It("Quota_Preemption_Delay_Inherited_From_Parent", func() {
298298
ginkgo.By("Quota preemption delay set on parent queue should be inherited by child queues that do not set it explicitly.")
299299

300300
// Apply initial config: parent has quota.preemption.delay=20s, child (queue-a) has no delay set.
@@ -313,7 +313,9 @@ var _ = ginkgo.Describe("QuotaPreemption", func() {
313313
Ω(err).NotTo(gomega.HaveOccurred())
314314

315315
ginkgo.By("Waiting for all 3 deployment pods to be running")
316-
err = kClient.WaitForPodBySelectorRunning(dev, "app=app-a", 30)
316+
err = kClient.WaitForPodBySelector(dev, "app=app-a", 20*time.Second)
317+
Ω(err).NotTo(gomega.HaveOccurred())
318+
err = kClient.WaitForPodBySelectorRunning(dev, "app=app-a", 10)
317319
Ω(err).NotTo(gomega.HaveOccurred())
318320
ginkgo.By("All 3 pods are running before quota is reduced")
319321

0 commit comments

Comments
 (0)