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

Removing extra boilerplate from test

Browse Source
This commit is contained in:
Stephen Heywood 2020-05-26 02:34:15 +00:00
parent cb7a680896
commit cd2ad2b986
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/e2e/framework/events/events.go
View File

@ -20,7 +20,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"strconv"
"strings" "strings"
"time" "time"
@ -127,7 +126,6 @@ var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
ginkgo.It("should delete a collection of events", func() { ginkgo.It("should delete a collection of events", func() {
eventTestNames := []string{"test-event-1", "test-event-2", "test-event-3"} eventTestNames := []string{"test-event-1", "test-event-2", "test-event-3"}
eventTestNamesCount := len(eventTestNames)
ginkgo.By("Create set of events") ginkgo.By("Create set of events")
// create a test event in test namespace // create a test event in test namespace
@ -158,18 +156,7 @@ var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
}) })
framework.ExpectNoError(err, "failed to get a list of events") framework.ExpectNoError(err, "failed to get a list of events")
// check that we find all the events created framework.ExpectEqual(len(eventList.Items), len(eventTestNames), "looking for expected number of pod templates events")
eventListItemsCount := len(eventList.Items)
errMsg := "found " + strconv.Itoa(eventListItemsCount) + " events when " + strconv.Itoa(eventTestNamesCount) + " events where expected"
logMsg := "found " + strconv.Itoa(eventListItemsCount) + " events"
foundCreatedEventSet := true
if eventListItemsCount != eventTestNamesCount {
foundCreatedEventSet = false
} else {
framework.Logf(logMsg)
}
framework.ExpectEqual(foundCreatedEventSet, true, errMsg)
ginkgo.By("delete collection of events") ginkgo.By("delete collection of events")
// delete collection // delete collection
@ -186,18 +173,7 @@ var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
}) })
framework.ExpectNoError(err, "failed to get a list of events") framework.ExpectNoError(err, "failed to get a list of events")
// check that we don't find any created events framework.ExpectEqual(len(eventList.Items), 0, "events should all be deleted")
eventListItemsCount = len(eventList.Items)
errMsg = "found " + strconv.Itoa(eventListItemsCount) + " events when zero events where expected"
logMsg = "found " + strconv.Itoa(eventListItemsCount) + " events"
foundCreatedEventSet = false
if eventListItemsCount != 0 {
foundCreatedEventSet = true
} else {
framework.Logf(logMsg)
}
framework.ExpectEqual(foundCreatedEventSet, false, errMsg)
}) })
}) })