github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Use framework.ExpectEqual() under test/e2e_kubeadm

Browse Source
This commit is contained in:
s-ito-ts 2019-07-31 06:56:50 +00:00
parent ad899665ea
commit 1a33b58a9c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_kubeadm/dns_addon_test.go
View File

@ -92,7 +92,7 @@ var _ = KubeadmDescribe("DNS addon", func() {
d := GetDeployment(f.ClientSet, kubeSystemNamespace, kubeDNSDeploymentName) 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) 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)
}) })
}) })
}) })

4
test/e2e_kubeadm/kubeadm_certs_test.go
View File

@ -65,11 +65,11 @@ var _ = KubeadmDescribe("kubeadm-certs [copy-certs]", func() {
// Checks the kubeadm-certs is ownen by a time lived token // 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) gomega.Expect(s.OwnerReferences).To(gomega.HaveLen(1), "%s should have one owner reference", kubeadmCertsSecretName)
ownRef := s.OwnerReferences[0] 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) gomega.Expect(*ownRef.BlockOwnerDeletion).To(gomega.BeTrue(), "%s should be deleted on owner deletion", kubeadmCertsSecretName)
o := GetSecret(f.ClientSet, kubeSystemNamespace, ownRef.Name) 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) 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 // gets the ClusterConfiguration from the kubeadm kubeadm-config ConfigMap as a untyped map

2
test/e2e_kubeadm/proxy_addon_test.go
View File

@ -94,7 +94,7 @@ var _ = KubeadmDescribe("proxy addon", func() {
ginkgo.It("should exist and be properly configured", func() { ginkgo.It("should exist and be properly configured", func() {
ds := GetDaemonSet(f.ClientSet, kubeSystemNamespace, kubeProxyDaemonSetName) 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)
}) })
}) })
}) })