From a6039c46e5274eb7ac0691c293f02706850ba8f8 Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Thu, 25 Apr 2019 18:27:14 +0000 Subject: [PATCH] Use framework.ExpectNoError() for e2e/auth The e2e test framework has ExpectNoError() for readable test code. This replaces Expect(err).NotTo(HaveOccurred()) with it for e2e/auth. --- test/e2e/auth/metadata_concealment.go | 5 ++--- test/e2e/auth/node_authn.go | 6 +++--- test/e2e/auth/node_authz.go | 16 ++++++++-------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/test/e2e/auth/metadata_concealment.go b/test/e2e/auth/metadata_concealment.go index 3002b964e4c..e3d94acb3a2 100644 --- a/test/e2e/auth/metadata_concealment.go +++ b/test/e2e/auth/metadata_concealment.go @@ -24,7 +24,6 @@ import ( jobutil "k8s.io/kubernetes/test/e2e/framework/job" . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" imageutil "k8s.io/kubernetes/test/utils/image" ) @@ -56,10 +55,10 @@ var _ = SIGDescribe("Metadata Concealment", func() { }, } job, err := jobutil.CreateJob(f.ClientSet, f.Namespace.Name, job) - Expect(err).NotTo(HaveOccurred(), "failed to create job (%s:%s)", f.Namespace.Name, job.Name) + framework.ExpectNoError(err, "failed to create job (%s:%s)", f.Namespace.Name, job.Name) By("Ensuring job reaches completions") err = jobutil.WaitForJobComplete(f.ClientSet, f.Namespace.Name, job.Name, int32(1)) - Expect(err).NotTo(HaveOccurred(), "failed to ensure job completion (%s:%s)", f.Namespace.Name, job.Name) + framework.ExpectNoError(err, "failed to ensure job completion (%s:%s)", f.Namespace.Name, job.Name) }) }) diff --git a/test/e2e/auth/node_authn.go b/test/e2e/auth/node_authn.go index 5afdc7c9fb0..ff7d311e8af 100644 --- a/test/e2e/auth/node_authn.go +++ b/test/e2e/auth/node_authn.go @@ -38,7 +38,7 @@ var _ = SIGDescribe("[Feature:NodeAuthenticator]", func() { ns = f.Namespace.Name nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{}) - Expect(err).NotTo(HaveOccurred(), "failed to list nodes in namespace: %s", ns) + framework.ExpectNoError(err, "failed to list nodes in namespace: %s", ns) Expect(len(nodeList.Items)).NotTo(BeZero()) pickedNode := nodeList.Items[0] @@ -49,7 +49,7 @@ var _ = SIGDescribe("[Feature:NodeAuthenticator]", func() { // make sure ServiceAccount admission controller is enabled, so secret generation on SA creation works saName := "default" sa, err := f.ClientSet.CoreV1().ServiceAccounts(ns).Get(saName, metav1.GetOptions{}) - Expect(err).NotTo(HaveOccurred(), "failed to retrieve service account (%s:%s)", ns, saName) + framework.ExpectNoError(err, "failed to retrieve service account (%s:%s)", ns, saName) Expect(len(sa.Secrets)).NotTo(BeZero()) }) @@ -73,7 +73,7 @@ var _ = SIGDescribe("[Feature:NodeAuthenticator]", func() { AutomountServiceAccountToken: &trueValue, } _, err := f.ClientSet.CoreV1().ServiceAccounts(ns).Create(newSA) - Expect(err).NotTo(HaveOccurred(), "failed to create service account (%s:%s)", ns, newSA.Name) + framework.ExpectNoError(err, "failed to create service account (%s:%s)", ns, newSA.Name) pod := createNodeAuthTestPod(f) diff --git a/test/e2e/auth/node_authz.go b/test/e2e/auth/node_authz.go index 0f967c95918..b7b13a4cbfc 100644 --- a/test/e2e/auth/node_authz.go +++ b/test/e2e/auth/node_authz.go @@ -51,24 +51,24 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() { ns = f.Namespace.Name nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{}) - Expect(err).NotTo(HaveOccurred(), "failed to list nodes in namespace: %s", ns) + framework.ExpectNoError(err, "failed to list nodes in namespace: %s", ns) Expect(len(nodeList.Items)).NotTo(Equal(0)) nodeName = nodeList.Items[0].Name asUser = NodeNamePrefix + nodeName saName := "default" sa, err := f.ClientSet.CoreV1().ServiceAccounts(ns).Get(saName, metav1.GetOptions{}) Expect(len(sa.Secrets)).NotTo(Equal(0)) - Expect(err).NotTo(HaveOccurred(), "failed to retrieve service account (%s:%s)", ns, saName) + framework.ExpectNoError(err, "failed to retrieve service account (%s:%s)", ns, saName) defaultSaSecret = sa.Secrets[0].Name By("Creating a kubernetes client that impersonates a node") config, err := framework.LoadConfig() - Expect(err).NotTo(HaveOccurred(), "failed to load kubernetes client config") + framework.ExpectNoError(err, "failed to load kubernetes client config") config.Impersonate = restclient.ImpersonationConfig{ UserName: asUser, Groups: []string{NodesGroup}, } c, err = clientset.NewForConfig(config) - Expect(err).NotTo(HaveOccurred(), "failed to create Clientset for the given config: %+v", *config) + framework.ExpectNoError(err, "failed to create Clientset for the given config: %+v", *config) }) It("Getting a non-existent secret should exit with the Forbidden error, not a NotFound error", func() { @@ -98,7 +98,7 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() { }, } _, err := f.ClientSet.CoreV1().ConfigMaps(ns).Create(configmap) - Expect(err).NotTo(HaveOccurred(), "failed to create configmap (%s:%s) %+v", ns, configmap.Name, *configmap) + framework.ExpectNoError(err, "failed to create configmap (%s:%s) %+v", ns, configmap.Name, *configmap) _, err = c.CoreV1().ConfigMaps(ns).Get(configmap.Name, metav1.GetOptions{}) Expect(apierrors.IsForbidden(err)).Should(Equal(true)) }) @@ -115,7 +115,7 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() { }, } _, err := f.ClientSet.CoreV1().Secrets(ns).Create(secret) - Expect(err).NotTo(HaveOccurred(), "failed to create secret (%s:%s)", ns, secret.Name) + framework.ExpectNoError(err, "failed to create secret (%s:%s)", ns, secret.Name) By("Node should not get the secret") _, err = c.CoreV1().Secrets(ns).Get(secret.Name, metav1.GetOptions{}) @@ -148,7 +148,7 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() { } _, err = f.ClientSet.CoreV1().Pods(ns).Create(pod) - Expect(err).NotTo(HaveOccurred(), "failed to create pod (%s:%s)", ns, pod.Name) + framework.ExpectNoError(err, "failed to create pod (%s:%s)", ns, pod.Name) By("The node should able to access the secret") itv := framework.Poll @@ -161,7 +161,7 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() { } return true, nil }) - Expect(err).NotTo(HaveOccurred(), "failed to get secret after trying every %v for %v (%s:%s)", itv, dur, ns, secret.Name) + framework.ExpectNoError(err, "failed to get secret after trying every %v for %v (%s:%s)", itv, dur, ns, secret.Name) }) It("A node shouldn't be able to create another node", func() {