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

Update: formatting, gomega Expect to framework ExpectEqual, framework creation to standard function

Browse Source
This commit is contained in:
Caleb Woodbine 2020-01-06 22:18:29 +00:00
parent 9951a9c98e
commit bd6550fb34
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/apimachinery/namespace.go
View File

@ -26,14 +26,13 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
imageutils "k8s.io/kubernetes/test/utils/image" imageutils "k8s.io/kubernetes/test/utils/image"
"k8s.io/apimachinery/pkg/util/uuid"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
) )
@ -252,11 +251,8 @@ var _ = SIGDescribe("Namespaces [Serial]", func() {
ginkgo.It("should patch a Namespace", func() { ginkgo.It("should patch a Namespace", func() {
ginkgo.By("creating a Namespace") ginkgo.By("creating a Namespace")
namespaceName := "nspatchtest-" + string(uuid.NewUUID()) namespaceName := "nspatchtest-" + string(uuid.NewUUID())
_, err := f.ClientSet.CoreV1().Namespaces().Create(&v1.Namespace{ ns, err := f.CreateNamespace(namespaceName, nil)
ObjectMeta: metav1.ObjectMeta{ namespaceName = ns.ObjectMeta.Name
Name: namespaceName,
},
})
framework.ExpectNoError(err, "failed creating Namespace") framework.ExpectNoError(err, "failed creating Namespace")
ginkgo.By("patching the Namespace") ginkgo.By("patching the Namespace")
@ -267,12 +263,7 @@ var _ = SIGDescribe("Namespaces [Serial]", func() {
ginkgo.By("get the Namespace and ensuring it has the label") ginkgo.By("get the Namespace and ensuring it has the label")
namespace, err := f.ClientSet.CoreV1().Namespaces().Get(namespaceName, metav1.GetOptions{}) namespace, err := f.ClientSet.CoreV1().Namespaces().Get(namespaceName, metav1.GetOptions{})
framework.ExpectNoError(err, "failed to get Namespace") framework.ExpectNoError(err, "failed to get Namespace")
gomega.Expect(namespace.ObjectMeta.Labels["testLabel"]).To(gomega.Equal("testValue"), "namespace not patched") framework.ExpectEqual(namespace.ObjectMeta.Labels["testLabel"], "testValue", "namespace not patched")
ginkgo.By("deleting the Namespace")
err = f.ClientSet.CoreV1().Namespaces().Delete(namespaceName, &metav1.DeleteOptions{})
framework.ExpectNoError(err, "failed to delete the test Namespace")
}) })
}) })