Skip to content

Commit afbbdbe

Browse files
authored
Merge pull request kubernetes#128685 from AnishShah/fix-ippr-test
[FG:InPlacePodVerticalScaling] assert specific error occurred in tests
2 parents 1b22629 + 36144e0 commit afbbdbe

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

test/e2e/node/pod_resize.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ func doPodResizeAdmissionPluginsTests() {
168168
ginkgo.By("patching pod for resize with memory exceeding resource quota")
169169
_, pErrExceedMemory := f.ClientSet.CoreV1().Pods(resizedPod.Namespace).Patch(ctx,
170170
resizedPod.Name, types.StrategicMergePatchType, []byte(patchStringExceedMemory), metav1.PatchOptions{}, "resize")
171-
gomega.Expect(pErrExceedMemory).To(gomega.HaveOccurred(), tc.wantMemoryError)
171+
gomega.Expect(pErrExceedMemory).To(gomega.HaveOccurred())
172+
gomega.Expect(pErrExceedMemory).To(gomega.MatchError(gomega.ContainSubstring(tc.wantMemoryError)))
172173

173174
ginkgo.By("verifying pod patched for resize exceeding memory resource quota remains unchanged")
174175
patchedPodExceedMemory, pErrEx2 := podClient.Get(ctx, resizedPod.Name, metav1.GetOptions{})
@@ -179,7 +180,8 @@ func doPodResizeAdmissionPluginsTests() {
179180
ginkgo.By(fmt.Sprintf("patching pod %s for resize with CPU exceeding resource quota", resizedPod.Name))
180181
_, pErrExceedCPU := f.ClientSet.CoreV1().Pods(resizedPod.Namespace).Patch(ctx,
181182
resizedPod.Name, types.StrategicMergePatchType, []byte(patchStringExceedCPU), metav1.PatchOptions{}, "resize")
182-
gomega.Expect(pErrExceedCPU).To(gomega.HaveOccurred(), tc.wantCPUError)
183+
gomega.Expect(pErrExceedCPU).To(gomega.HaveOccurred())
184+
gomega.Expect(pErrExceedCPU).To(gomega.MatchError(gomega.ContainSubstring(tc.wantCPUError)))
183185

184186
ginkgo.By("verifying pod patched for resize exceeding CPU resource quota remains unchanged")
185187
patchedPodExceedCPU, pErrEx1 := podClient.Get(ctx, resizedPod.Name, metav1.GetOptions{})

0 commit comments

Comments
 (0)