From 1a33b58a9cffaaa24bee51ac660f6f85348a2cba Mon Sep 17 00:00:00 2001 From: s-ito-ts Date: Wed, 31 Jul 2019 06:56:50 +0000 Subject: [PATCH] Use framework.ExpectEqual() under test/e2e_kubeadm --- test/e2e_kubeadm/dns_addon_test.go | 4 ++-- test/e2e_kubeadm/kubeadm_certs_test.go | 4 ++-- test/e2e_kubeadm/proxy_addon_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e_kubeadm/dns_addon_test.go b/test/e2e_kubeadm/dns_addon_test.go index 9c4c6e7eac4..d095a1532d3 100644 --- a/test/e2e_kubeadm/dns_addon_test.go +++ b/test/e2e_kubeadm/dns_addon_test.go @@ -92,7 +92,7 @@ var _ = KubeadmDescribe("DNS addon", func() { d := GetDeployment(f.ClientSet, kubeSystemNamespace, kubeDNSDeploymentName) - gomega.Expect(d.Spec.Template.Spec.ServiceAccountName).To(gomega.Equal(kubeDNSServiceAccountName)) + framework.ExpectEqual(d.Spec.Template.Spec.ServiceAccountName, kubeDNSServiceAccountName) }) }) }) @@ -137,7 +137,7 @@ var _ = KubeadmDescribe("DNS addon", func() { d := GetDeployment(f.ClientSet, kubeSystemNamespace, coreDNSDeploymentName) - gomega.Expect(d.Spec.Template.Spec.ServiceAccountName).To(gomega.Equal(coreDNSServiceAccountName)) + framework.ExpectEqual(d.Spec.Template.Spec.ServiceAccountName, coreDNSServiceAccountName) }) }) }) diff --git a/test/e2e_kubeadm/kubeadm_certs_test.go b/test/e2e_kubeadm/kubeadm_certs_test.go index 03645c7fe15..eeea604c68e 100644 --- a/test/e2e_kubeadm/kubeadm_certs_test.go +++ b/test/e2e_kubeadm/kubeadm_certs_test.go @@ -65,11 +65,11 @@ var _ = KubeadmDescribe("kubeadm-certs [copy-certs]", func() { // Checks the kubeadm-certs is ownen by a time lived token gomega.Expect(s.OwnerReferences).To(gomega.HaveLen(1), "%s should have one owner reference", kubeadmCertsSecretName) ownRef := s.OwnerReferences[0] - gomega.Expect(ownRef.Kind).To(gomega.Equal("Secret"), "%s should be owned by a secret", kubeadmCertsSecretName) + framework.ExpectEqual(ownRef.Kind, "Secret", "%s should be owned by a secret", kubeadmCertsSecretName) gomega.Expect(*ownRef.BlockOwnerDeletion).To(gomega.BeTrue(), "%s should be deleted on owner deletion", kubeadmCertsSecretName) o := GetSecret(f.ClientSet, kubeSystemNamespace, ownRef.Name) - gomega.Expect(o.Type).To(gomega.Equal(corev1.SecretTypeBootstrapToken), "%s should have an owner reference that refers to a bootstrap-token", kubeadmCertsSecretName) + framework.ExpectEqual(o.Type, corev1.SecretTypeBootstrapToken, "%s should have an owner reference that refers to a bootstrap-token", kubeadmCertsSecretName) gomega.Expect(o.Data).To(gomega.HaveKey("expiration"), "%s should have an owner reference with an expiration", kubeadmCertsSecretName) // gets the ClusterConfiguration from the kubeadm kubeadm-config ConfigMap as a untyped map diff --git a/test/e2e_kubeadm/proxy_addon_test.go b/test/e2e_kubeadm/proxy_addon_test.go index 57348cf72d2..3033eaf8914 100644 --- a/test/e2e_kubeadm/proxy_addon_test.go +++ b/test/e2e_kubeadm/proxy_addon_test.go @@ -94,7 +94,7 @@ var _ = KubeadmDescribe("proxy addon", func() { ginkgo.It("should exist and be properly configured", func() { ds := GetDaemonSet(f.ClientSet, kubeSystemNamespace, kubeProxyDaemonSetName) - gomega.Expect(ds.Spec.Template.Spec.ServiceAccountName).To(gomega.Equal(kubeProxyServiceAccountName)) + framework.ExpectEqual(ds.Spec.Template.Spec.ServiceAccountName, kubeProxyServiceAccountName) }) }) })