diff --git a/test/e2e/apps/disruption.go b/test/e2e/apps/disruption.go index d2910ed0f7b..8e9f8d9646e 100644 --- a/test/e2e/apps/disruption.go +++ b/test/e2e/apps/disruption.go @@ -188,7 +188,7 @@ var _ = SIGDescribe("DisruptionController", func() { framework.ExpectNoError(err, "failed to marshal JSON for new data") return jsonpatch.CreateMergePatch(oldBytes, newBytes) }, "status") - framework.ExpectEmpty(patched.Status.DisruptedPods, "Expecting the PodDisruptionBudget's be empty") + gomega.Expect(patched.Status.DisruptedPods).To(gomega.BeEmpty(), "Expecting the PodDisruptionBudget's be empty") }) // PDB shouldn't error out when there are unmanaged pods diff --git a/test/e2e/auth/service_accounts.go b/test/e2e/auth/service_accounts.go index e8ef514bd1b..a47b07d816d 100644 --- a/test/e2e/auth/service_accounts.go +++ b/test/e2e/auth/service_accounts.go @@ -48,6 +48,7 @@ import ( utilptr "k8s.io/utils/pointer" "github.com/onsi/ginkgo/v2" + "github.com/onsi/gomega" ) const rootCAConfigMapName = "kube-root-ca.crt" @@ -62,7 +63,7 @@ var _ = SIGDescribe("ServiceAccounts", func() { time.Sleep(10 * time.Second) sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get(ctx, "default", metav1.GetOptions{}) framework.ExpectNoError(err) - framework.ExpectEmpty(sa.Secrets) + gomega.Expect(sa.Secrets).To(gomega.BeEmpty()) } }) diff --git a/test/e2e/storage/csi_mock/csi_fsgroup_mount.go b/test/e2e/storage/csi_mock/csi_fsgroup_mount.go index 7350452c652..8c8112a73b7 100644 --- a/test/e2e/storage/csi_mock/csi_fsgroup_mount.go +++ b/test/e2e/storage/csi_mock/csi_fsgroup_mount.go @@ -22,6 +22,8 @@ import ( "strconv" "github.com/onsi/ginkgo/v2" + "github.com/onsi/gomega" + "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" @@ -76,8 +78,8 @@ var _ = utils.SIGDescribe("CSI Mock fsgroup as mount option", func() { framework.ExpectEqual(nodeStageFsGroup, fsGroupStr, "Expect NodeStageVolumeRequest.VolumeCapability.MountVolume.VolumeMountGroup to equal %q; got: %q", fsGroupStr, nodeStageFsGroup) framework.ExpectEqual(nodePublishFsGroup, fsGroupStr, "Expect NodePublishVolumeRequest.VolumeCapability.MountVolume.VolumeMountGroup to equal %q; got: %q", fsGroupStr, nodePublishFsGroup) } else { - framework.ExpectEmpty(nodeStageFsGroup, "Expect NodeStageVolumeRequest.VolumeCapability.MountVolume.VolumeMountGroup to be empty; got: %q", nodeStageFsGroup) - framework.ExpectEmpty(nodePublishFsGroup, "Expect NodePublishVolumeRequest.VolumeCapability.MountVolume.VolumeMountGroup to empty; got: %q", nodePublishFsGroup) + gomega.Expect(nodeStageFsGroup).To(gomega.BeEmpty(), "Expect NodeStageVolumeRequest.VolumeCapability.MountVolume.VolumeMountGroup to be empty; got: %q", nodeStageFsGroup) + gomega.Expect(nodePublishFsGroup).To(gomega.BeEmpty(), "Expect NodePublishVolumeRequest.VolumeCapability.MountVolume.VolumeMountGroup to empty; got: %q", nodePublishFsGroup) } }) }