From fcb792964daf8f5abc448955e569a8164985a504 Mon Sep 17 00:00:00 2001 From: NoSkillGirl Date: Fri, 18 Jun 2021 23:55:54 +0530 Subject: [PATCH] calling metrics in generate e2e Signed-off-by: NoSkillGirl --- test/e2e/generate/generate_test.go | 29 ++++++++++++++++++++++++++--- test/e2e/metrics/metrics_test.go | 18 +++++++++++++----- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/test/e2e/generate/generate_test.go b/test/e2e/generate/generate_test.go index 9c459f4005..c7c1d8045b 100644 --- a/test/e2e/generate/generate_test.go +++ b/test/e2e/generate/generate_test.go @@ -1,6 +1,7 @@ package generate import ( + "bytes" "errors" "fmt" "os" @@ -296,9 +297,9 @@ func Test_Role_RoleBinding_Sets(t *testing.T) { func Test_Generate_NetworkPolicy(t *testing.T) { RegisterTestingT(t) - if os.Getenv("E2E") == "" { - t.Skip("Skipping E2E Test") - } + // if os.Getenv("E2E") == "" { + // t.Skip("Skipping E2E Test") + // } // Generate E2E Client ================== e2eClient, err := e2e.NewE2EClient() Expect(err).To(BeNil()) @@ -324,6 +325,9 @@ func Test_Generate_NetworkPolicy(t *testing.T) { } return errors.New("deleting Namespace") }) + + // check metrics before policy craetion + callMetrics() // ==================================== // ======== Create Generate NetworkPolicy Policy ============= By("Creating Generate NetworkPolicy Policy") @@ -331,6 +335,9 @@ func Test_Generate_NetworkPolicy(t *testing.T) { Expect(err).NotTo(HaveOccurred()) // ============================================ + // check metrics after policy craetion + callMetrics() + // ======= Create Namespace ================== By(fmt.Sprintf("Creating Namespace which triggers generate %s", npPolNS)) _, err = e2eClient.CreateClusteredResourceYaml(nsGVR, namespaceWithLabelYaml) @@ -380,6 +387,22 @@ func Test_Generate_NetworkPolicy(t *testing.T) { } } +func callMetrics() { + requestObj := e2e.APIRequest{ + URL: "http://localhost:8000/metrics", + Type: "GET", + } + response, err := e2e.CallAPI(requestObj) + Expect(err).NotTo(HaveOccurred()) + buf := new(bytes.Buffer) + buf.ReadFrom(response.Body) + newStr := buf.String() + fmt.Println("==============================================================") + fmt.Println(newStr) + fmt.Println("==============================================================") + +} + func Test_Generate_Namespace_Label_Actions(t *testing.T) { RegisterTestingT(t) if os.Getenv("E2E") == "" { diff --git a/test/e2e/metrics/metrics_test.go b/test/e2e/metrics/metrics_test.go index edb416280e..a61bcc619e 100644 --- a/test/e2e/metrics/metrics_test.go +++ b/test/e2e/metrics/metrics_test.go @@ -1,22 +1,30 @@ package metrics import ( + "bytes" + "fmt" + "testing" + "github.com/kyverno/kyverno/test/e2e" . "github.com/onsi/gomega" - "os" - "testing" ) func Test_MetricsServerAvailability(t *testing.T) { RegisterTestingT(t) - if os.Getenv("E2E") == "" { - t.Skip("Skipping E2E Test") - } + // if os.Getenv("E2E") == "" { + // t.Skip("Skipping E2E Test") + // } requestObj := e2e.APIRequest{ URL: "http://localhost:8000/metrics", Type: "GET", } response, err := e2e.CallAPI(requestObj) Expect(err).NotTo(HaveOccurred()) + buf := new(bytes.Buffer) + buf.ReadFrom(response.Body) + newStr := buf.String() + fmt.Println("==============================================================") + fmt.Println(newStr) + fmt.Println("==============================================================") Expect(response.StatusCode).To(Equal(200)) }