github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e2e: replace gomega.Equal(true/false) with gomega.BeTrue/BeFalse()

Browse Source 
The failure message becomes a bit nicer. Found by the new ginkgolinter, for
example:

    test/e2e/windows/memory_limits.go:160:2: ginkgo-linter: wrong boolean assertion; consider using `gomega.Eventually(ctx, func() bool {
     eventList, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(ctx, metav1.ListOptions{})
     ...
    }, 3*time.Minute, 10*time.Second).Should(gomega.BeTrue())` instead (ginkgolinter)
This commit is contained in:
Patrick Ohly
2023-06-27 13:47:01 +02:00
parent 8b33e8bdd1
commit e7df337eba
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/windows/memory_limits.go
View File

@@ -168,7 +168,7 @@ func overrideAllocatableMemoryTest(ctx context.Context, f *framework.Framework,
} }
} }
return false return false
}, 3*time.Minute, 10*time.Second).Should(gomega.Equal(true)) }, 3*time.Minute, 10*time.Second).Should(gomega.BeTrue())
} }

4
test/e2e_node/hugepages_test.go
View File

@@ -227,7 +227,7 @@ var _ = SIGDescribe("HugePages [Serial] [Feature:HugePages][NodeSpecialFeature:H
framework.ExpectNoError(err, "while getting node status") framework.ExpectNoError(err, "while getting node status")
_, isPresent := node.Status.Capacity["hugepages-3Mi"] _, isPresent := node.Status.Capacity["hugepages-3Mi"]
return isPresent return isPresent
}, 30*time.Second, framework.Poll).Should(gomega.Equal(false)) }, 30*time.Second, framework.Poll).Should(gomega.BeFalse())
}) })
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) {
@@ -247,7 +247,7 @@ var _ = SIGDescribe("HugePages [Serial] [Feature:HugePages][NodeSpecialFeature:H
framework.ExpectNoError(err, "while getting node status") framework.ExpectNoError(err, "while getting node status")
_, isPresent := node.Status.Capacity["hugepages-2Mi"] _, isPresent := node.Status.Capacity["hugepages-2Mi"]
return isPresent return isPresent
}, 30*time.Second, framework.Poll).Should(gomega.Equal(true)) }, 30*time.Second, framework.Poll).Should(gomega.BeTrue())
}) })
ginkgo.When("start the pod", func() { ginkgo.When("start the pod", func() {

2
test/e2e_node/memory_manager_test.go
View File

@@ -627,7 +627,7 @@ var _ = SIGDescribe("Memory Manager [Disruptive] [Serial] [Feature:MemoryManager
return true return true
}, time.Minute, 5*time.Second).Should( }, time.Minute, 5*time.Second).Should(
gomega.Equal(true), gomega.BeTrue(),
"the pod succeeded to start, when it should fail with the admission error", "the pod succeeded to start, when it should fail with the admission error",
) )
}) })