github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 22:33:34 +00:00
Code Issues Projects Releases Wiki Activity

e2e_instrumentation: stop using deprecated framework.ExpectEqual

Browse Source
This commit is contained in:
carlory 2023-07-21 15:41:26 +08:00
parent 4457f85eb3
commit 2222509cb4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/instrumentation/core_events.go
View File

@ -31,6 +31,7 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
) )
@ -114,7 +115,7 @@ var _ = common.SIGDescribe("Events", func() {
// get event by name // get event by name
event, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Get(ctx, eventCreatedName, metav1.GetOptions{}) event, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Get(ctx, eventCreatedName, metav1.GetOptions{})
framework.ExpectNoError(err, "failed to fetch the test event") framework.ExpectNoError(err, "failed to fetch the test event")
framework.ExpectEqual(event.Message, eventPatchMessage, "test event message does not match patch message") gomega.Expect(event.Message).To(gomega.Equal(eventPatchMessage), "test event message does not match patch message")
ginkgo.By("updating the test event") ginkgo.By("updating the test event")
@ -204,7 +205,7 @@ var _ = common.SIGDescribe("Events", func() {
}) })
framework.ExpectNoError(err, "failed to get a list of events") framework.ExpectNoError(err, "failed to get a list of events")
framework.ExpectEqual(len(eventList.Items), len(eventTestNames), "looking for expected number of pod templates events") gomega.Expect(eventList.Items).To(gomega.HaveLen(len(eventTestNames)), "looking for expected number of pod templates events")
ginkgo.By("delete collection of events") ginkgo.By("delete collection of events")
// delete collection // delete collection

6
test/e2e/instrumentation/events.go
View File

@ -19,7 +19,6 @@ package instrumentation
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"time" "time"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
@ -35,6 +34,7 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
) )
@ -218,7 +218,7 @@ var _ = common.SIGDescribe("Events API", func() {
LabelSelector: "testevent-set=true", LabelSelector: "testevent-set=true",
}) })
framework.ExpectNoError(err, "failed to get a list of events") framework.ExpectNoError(err, "failed to get a list of events")
framework.ExpectEqual(len(eventList.Items), len(eventNames), fmt.Sprintf("unexpected event list: %#v", eventList)) gomega.Expect(eventList.Items).To(gomega.HaveLen(len(eventNames)), "unexpected event list: %#v", eventList)
ginkgo.By("delete a list of events") ginkgo.By("delete a list of events")
framework.Logf("requesting DeleteCollection of events") framework.Logf("requesting DeleteCollection of events")
@ -232,6 +232,6 @@ var _ = common.SIGDescribe("Events API", func() {
LabelSelector: "testevent-set=true", LabelSelector: "testevent-set=true",
}) })
framework.ExpectNoError(err, "failed to get a list of events") framework.ExpectNoError(err, "failed to get a list of events")
framework.ExpectEqual(len(eventList.Items), 0, fmt.Sprintf("unexpected event list: %#v", eventList)) gomega.Expect(eventList.Items).To(gomega.BeEmpty(), "unexpected event list: %#v", eventList)
}) })
}) })