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

Merge pull request #92902 from k-toyoda-pi/unset_alias_metrics_grabber

Browse Source 
e2e/metrics_grabber: unset aliases for ginkgo and gomega packages
This commit is contained in:
Kubernetes Prow Robot 2020-07-12 06:58:57 -07:00 committed by GitHub
commit 8da9e9b326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/e2e/instrumentation/monitoring/metrics_grabber.go
View File

@ -27,15 +27,15 @@ import (
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
gin "github.com/onsi/ginkgo"
gom "github.com/onsi/gomega"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)
var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
f := framework.NewDefaultFramework("metrics-grabber")
var c, ec clientset.Interface
var grabber *e2emetrics.Grabber
gin.BeforeEach(func() {
ginkgo.BeforeEach(func() {
var err error
c = f.ClientSet
ec = f.KubemarkExternalClusterClientSet
@ -44,24 +44,24 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
framework.ExpectNoError(err)
})
gin.It("should grab all metrics from API server.", func() {
gin.By("Connecting to /metrics endpoint")
ginkgo.It("should grab all metrics from API server.", func() {
ginkgo.By("Connecting to /metrics endpoint")
response, err := grabber.GrabFromAPIServer()
framework.ExpectNoError(err)
gom.Expect(response).NotTo(gom.BeEmpty())
gomega.Expect(response).NotTo(gomega.BeEmpty())
})
gin.It("should grab all metrics from a Kubelet.", func() {
gin.By("Proxying to Node through the API server")
ginkgo.It("should grab all metrics from a Kubelet.", func() {
ginkgo.By("Proxying to Node through the API server")
node, err := e2enode.GetRandomReadySchedulableNode(f.ClientSet)
framework.ExpectNoError(err)
response, err := grabber.GrabFromKubelet(node.Name)
framework.ExpectNoError(err)
gom.Expect(response).NotTo(gom.BeEmpty())
gomega.Expect(response).NotTo(gomega.BeEmpty())
})
gin.It("should grab all metrics from a Scheduler.", func() {
gin.By("Proxying to Pod through the API server")
ginkgo.It("should grab all metrics from a Scheduler.", func() {
ginkgo.By("Proxying to Pod through the API server")
// Check if master Node is registered
nodes, err := c.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
framework.ExpectNoError(err)
@ -78,11 +78,11 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
}
response, err := grabber.GrabFromScheduler()
framework.ExpectNoError(err)
gom.Expect(response).NotTo(gom.BeEmpty())
gomega.Expect(response).NotTo(gomega.BeEmpty())
})
gin.It("should grab all metrics from a ControllerManager.", func() {
gin.By("Proxying to Pod through the API server")
ginkgo.It("should grab all metrics from a ControllerManager.", func() {
ginkgo.By("Proxying to Pod through the API server")
// Check if master Node is registered
nodes, err := c.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
framework.ExpectNoError(err)
@ -99,6 +99,6 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
}
response, err := grabber.GrabFromControllerManager()
framework.ExpectNoError(err)
gom.Expect(response).NotTo(gom.BeEmpty())
gomega.Expect(response).NotTo(gomega.BeEmpty())
})
})