github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Use ExpectEqual in e2e/auth

Browse Source
This commit is contained in:
ClarkLee 2019-07-04 11:41:20 +08:00
parent 886c5d261f
commit b94b1672f9
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/auth/pod_security_policy.go
View File

@ -117,7 +117,7 @@ var _ = SIGDescribe("PodSecurityPolicy", func() {
framework.ExpectNoError(err) framework.ExpectNoError(err)
validated, found := p.Annotations[psputil.ValidatedPSPAnnotation] validated, found := p.Annotations[psputil.ValidatedPSPAnnotation]
gomega.Expect(found).To(gomega.BeTrue(), "PSP annotation not found") gomega.Expect(found).To(gomega.BeTrue(), "PSP annotation not found")
gomega.Expect(validated).To(gomega.Equal(expectedPSP.Name), "Unexpected validated PSP") framework.ExpectEqual(validated, expectedPSP.Name, "Unexpected validated PSP")
}) })
}) })
}) })

23
test/e2e/auth/service_accounts.go
View File

@ -37,7 +37,6 @@ import (
imageutils "k8s.io/kubernetes/test/utils/image" imageutils "k8s.io/kubernetes/test/utils/image"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"github.com/onsi/gomega"
) )
var mountImage = imageutils.GetE2EImage(imageutils.Mounttest) var mountImage = imageutils.GetE2EImage(imageutils.Mounttest)
@ -78,7 +77,7 @@ var _ = SIGDescribe("ServiceAccounts", func() {
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{}) sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
gomega.Expect(sa.Secrets).To(gomega.Equal(secrets)) framework.ExpectEqual(sa.Secrets, secrets)
} }
// delete the referenced secret // delete the referenced secret
@ -116,7 +115,7 @@ var _ = SIGDescribe("ServiceAccounts", func() {
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{}) sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
gomega.Expect(sa.Secrets).To(gomega.Equal(secrets)) framework.ExpectEqual(sa.Secrets, secrets)
} }
// delete the reference from the service account // delete the reference from the service account
@ -156,7 +155,7 @@ var _ = SIGDescribe("ServiceAccounts", func() {
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{}) sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
gomega.Expect(sa.Secrets).To(gomega.Equal(secrets)) framework.ExpectEqual(sa.Secrets, secrets)
} }
}) })
@ -234,19 +233,19 @@ var _ = SIGDescribe("ServiceAccounts", func() {
framework.ExpectNoError(err) framework.ExpectNoError(err)
// CA and namespace should be identical // CA and namespace should be identical
gomega.Expect(mountedCA).To(gomega.Equal(rootCAContent)) framework.ExpectEqual(mountedCA, rootCAContent)
gomega.Expect(mountedNamespace).To(gomega.Equal(f.Namespace.Name)) framework.ExpectEqual(mountedNamespace, f.Namespace.Name)
// Token should be a valid credential that identifies the pod's service account // Token should be a valid credential that identifies the pod's service account
tokenReview := &authenticationv1.TokenReview{Spec: authenticationv1.TokenReviewSpec{Token: mountedToken}} tokenReview := &authenticationv1.TokenReview{Spec: authenticationv1.TokenReviewSpec{Token: mountedToken}}
tokenReview, err = f.ClientSet.AuthenticationV1().TokenReviews().Create(tokenReview) tokenReview, err = f.ClientSet.AuthenticationV1().TokenReviews().Create(tokenReview)
framework.ExpectNoError(err) framework.ExpectNoError(err)
gomega.Expect(tokenReview.Status.Authenticated).To(gomega.Equal(true)) framework.ExpectEqual(tokenReview.Status.Authenticated, true)
gomega.Expect(tokenReview.Status.Error).To(gomega.Equal("")) framework.ExpectEqual(tokenReview.Status.Error, "")
gomega.Expect(tokenReview.Status.User.Username).To(gomega.Equal("system:serviceaccount:" + f.Namespace.Name + ":" + sa.Name)) framework.ExpectEqual(tokenReview.Status.User.Username, "system:serviceaccount:"+f.Namespace.Name+":"+sa.Name)
groups := sets.NewString(tokenReview.Status.User.Groups...) groups := sets.NewString(tokenReview.Status.User.Groups...)
gomega.Expect(groups.Has("system:authenticated")).To(gomega.Equal(true), fmt.Sprintf("expected system:authenticated group, had %v", groups.List())) framework.ExpectEqual(groups.Has("system:authenticated"), true, fmt.Sprintf("expected system:authenticated group, had %v", groups.List()))
gomega.Expect(groups.Has("system:serviceaccounts")).To(gomega.Equal(true), fmt.Sprintf("expected system:serviceaccounts group, had %v", groups.List())) framework.ExpectEqual(groups.Has("system:serviceaccounts"), true, fmt.Sprintf("expected system:serviceaccounts group, had %v", groups.List()))
gomega.Expect(groups.Has("system:serviceaccounts:"+f.Namespace.Name)).To(gomega.Equal(true), fmt.Sprintf("expected system:serviceaccounts:"+f.Namespace.Name+" group, had %v", groups.List())) framework.ExpectEqual(groups.Has("system:serviceaccounts:"+f.Namespace.Name), true, fmt.Sprintf("expected system:serviceaccounts:"+f.Namespace.Name+" group, had %v", groups.List()))
}) })
/* /*