mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-09 03:57:41 +00:00
Merge pull request #126842 from saschagrunert/hugepages-test
Fix hugepages e2e test assertion
This commit is contained in:
commit
b3c725627b
@ -225,12 +225,12 @@ var _ = SIGDescribe("HugePages", framework.WithSerial(), feature.HugePages, "[No
|
|||||||
restartKubelet(true)
|
restartKubelet(true)
|
||||||
|
|
||||||
ginkgo.By("verifying that the hugepages-3Mi resource no longer is present")
|
ginkgo.By("verifying that the hugepages-3Mi resource no longer is present")
|
||||||
gomega.Eventually(ctx, func() resource.Quantity {
|
gomega.Eventually(ctx, func() bool {
|
||||||
node, err = f.ClientSet.CoreV1().Nodes().Get(ctx, framework.TestContext.NodeName, metav1.GetOptions{})
|
node, err = f.ClientSet.CoreV1().Nodes().Get(ctx, framework.TestContext.NodeName, metav1.GetOptions{})
|
||||||
framework.ExpectNoError(err, "while getting node status")
|
framework.ExpectNoError(err, "while getting node status")
|
||||||
// abc, error := node.Status.Capacity["hugepages-3Mi"]
|
_, isPresent := node.Status.Capacity["hugepages-3Mi"]
|
||||||
return node.Status.Capacity["hugepages-3Mi"]
|
return isPresent
|
||||||
}, 30*time.Second, framework.Poll).Should(gomega.BeNil())
|
}, 30*time.Second, framework.Poll).Should(gomega.BeFalseBecause("hugepages resource should not be present"))
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.It("should add resources for new huge page sizes on kubelet restart", func(ctx context.Context) {
|
ginkgo.It("should add resources for new huge page sizes on kubelet restart", func(ctx context.Context) {
|
||||||
@ -245,11 +245,12 @@ var _ = SIGDescribe("HugePages", framework.WithSerial(), feature.HugePages, "[No
|
|||||||
startKubelet()
|
startKubelet()
|
||||||
|
|
||||||
ginkgo.By("verifying that the hugepages-2Mi resource is present")
|
ginkgo.By("verifying that the hugepages-2Mi resource is present")
|
||||||
gomega.Eventually(ctx, func() resource.Quantity {
|
gomega.Eventually(ctx, func() bool {
|
||||||
node, err := f.ClientSet.CoreV1().Nodes().Get(ctx, framework.TestContext.NodeName, metav1.GetOptions{})
|
node, err := f.ClientSet.CoreV1().Nodes().Get(ctx, framework.TestContext.NodeName, metav1.GetOptions{})
|
||||||
framework.ExpectNoError(err, "while getting node status")
|
framework.ExpectNoError(err, "while getting node status")
|
||||||
return node.Status.Capacity["hugepages-2Mi"]
|
_, isPresent := node.Status.Capacity["hugepages-2Mi"]
|
||||||
}, 30*time.Second, framework.Poll).ShouldNot(gomega.BeNil())
|
return isPresent
|
||||||
|
}, 30*time.Second, framework.Poll).Should(gomega.BeTrueBecause("hugepages resource should be present"))
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.When("start the pod", func() {
|
ginkgo.When("start the pod", func() {
|
||||||
|
Loading…
Reference in New Issue
Block a user