New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Create deleteCoreV1CollectionNamespacedEvent test - +1 endpoint coverage #91230
Merged
k8s-ci-robot
merged 7 commits into
kubernetes:master
from
ii:heyste-create-delete-core-v1-collection-namespaced-event-test
Jun 18, 2020
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
cb7a680
Add: test to ensure that a set of events can be removed by delete col…
heyste cd2ad2b
Removing extra boilerplate from test
heyste 7622a79
Use polling while deleting the collection of events
heyste b3baef5
Fix gofmt issues
heyste ecb6874
Fix golint issue
heyste b26c782
Relocate tests from framework/events/events.go & update polling check
heyste 04627ce
Address issues with test failures
heyste File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package apimachinery | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "time" | ||
|
|
||
| v1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/util/wait" | ||
| "k8s.io/kubernetes/test/e2e/framework" | ||
|
|
||
| "github.com/onsi/ginkgo" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| ) | ||
|
|
||
| const ( | ||
| eventRetryPeriod = 1 * time.Second | ||
| eventRetryTimeout = 1 * time.Minute | ||
| ) | ||
|
|
||
| var _ = ginkgo.Describe("[sig-api-machinery] Events", func() { | ||
| f := framework.NewDefaultFramework("events") | ||
|
|
||
| /* | ||
| Release : v1.19 | ||
| Testname: Event resource lifecycle | ||
| Description: Create an event, the event MUST exist. | ||
| The event is patched with a new message, the check MUST have the update message. | ||
| The event is deleted and MUST NOT show up when listing all events. | ||
| */ | ||
| framework.ConformanceIt("should ensure that an event can be fetched, patched, deleted, and listed", func() { | ||
| eventTestName := "event-test" | ||
|
|
||
| ginkgo.By("creating a test event") | ||
| // create a test event in test namespace | ||
| _, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: eventTestName, | ||
| Labels: map[string]string{ | ||
| "testevent-constant": "true", | ||
| }, | ||
| }, | ||
| Message: "This is a test event", | ||
| Reason: "Test", | ||
| Type: "Normal", | ||
| Count: 1, | ||
| InvolvedObject: v1.ObjectReference{ | ||
| Namespace: f.Namespace.Name, | ||
| }, | ||
| }, metav1.CreateOptions{}) | ||
| framework.ExpectNoError(err, "failed to create test event") | ||
|
|
||
| ginkgo.By("listing all events in all namespaces") | ||
| // get a list of Events in all namespaces to ensure endpoint coverage | ||
| eventsList, err := f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{ | ||
| LabelSelector: "testevent-constant=true", | ||
| }) | ||
| framework.ExpectNoError(err, "failed list all events") | ||
|
|
||
| foundCreatedEvent := false | ||
| var eventCreatedName string | ||
| for _, val := range eventsList.Items { | ||
| if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name { | ||
| foundCreatedEvent = true | ||
| eventCreatedName = val.ObjectMeta.Name | ||
| break | ||
| } | ||
| } | ||
| framework.ExpectEqual(foundCreatedEvent, true, "unable to find the test event") | ||
|
|
||
| ginkgo.By("patching the test event") | ||
| // patch the event's message | ||
| eventPatchMessage := "This is a test event - patched" | ||
| eventPatch, err := json.Marshal(map[string]interface{}{ | ||
| "message": eventPatchMessage, | ||
| }) | ||
| framework.ExpectNoError(err, "failed to marshal the patch JSON payload") | ||
|
|
||
| _, err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Patch(context.TODO(), eventTestName, types.StrategicMergePatchType, []byte(eventPatch), metav1.PatchOptions{}) | ||
| framework.ExpectNoError(err, "failed to patch the test event") | ||
|
|
||
| ginkgo.By("fetching the test event") | ||
| // get event by name | ||
| event, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Get(context.TODO(), eventCreatedName, metav1.GetOptions{}) | ||
| framework.ExpectNoError(err, "failed to fetch the test event") | ||
| framework.ExpectEqual(event.Message, eventPatchMessage, "test event message does not match patch message") | ||
|
|
||
| ginkgo.By("deleting the test event") | ||
| // delete original event | ||
| err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Delete(context.TODO(), eventCreatedName, metav1.DeleteOptions{}) | ||
| framework.ExpectNoError(err, "failed to delete the test event") | ||
|
|
||
| ginkgo.By("listing all events in all namespaces") | ||
| // get a list of Events list namespace | ||
| eventsList, err = f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{ | ||
| LabelSelector: "testevent-constant=true", | ||
| }) | ||
| framework.ExpectNoError(err, "fail to list all events") | ||
| foundCreatedEvent = false | ||
| for _, val := range eventsList.Items { | ||
| if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name { | ||
| foundCreatedEvent = true | ||
| break | ||
| } | ||
| } | ||
| framework.ExpectEqual(foundCreatedEvent, false, "should not have found test event after deletion") | ||
| }) | ||
|
|
||
| ginkgo.It("should delete a collection of events", func() { | ||
| eventTestNames := []string{"test-event-1", "test-event-2", "test-event-3"} | ||
|
|
||
| ginkgo.By("Create set of events") | ||
| // create a test event in test namespace | ||
| for _, eventTestName := range eventTestNames { | ||
| eventMessage := "This is " + eventTestName | ||
| _, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{ | ||
|
|
||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: eventTestName, | ||
| Labels: map[string]string{"testevent-set": "true"}, | ||
| }, | ||
| Message: eventMessage, | ||
| Reason: "Test", | ||
| Type: "Normal", | ||
| Count: 1, | ||
| InvolvedObject: v1.ObjectReference{ | ||
| Namespace: f.Namespace.Name, | ||
| }, | ||
| }, metav1.CreateOptions{}) | ||
| framework.ExpectNoError(err, "failed to create event") | ||
| framework.Logf("created %v", eventTestName) | ||
| } | ||
|
|
||
| ginkgo.By("get a list of Events with a label in the current namespace") | ||
| // get a list of events | ||
| eventList, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{ | ||
| LabelSelector: "testevent-set=true", | ||
| }) | ||
| 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") | ||
|
|
||
| ginkgo.By("delete collection of events") | ||
| // delete collection | ||
|
|
||
| framework.Logf("requesting DeleteCollection of events") | ||
| err = f.ClientSet.CoreV1().Events(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{ | ||
| LabelSelector: "testevent-set=true"}) | ||
| framework.ExpectNoError(err, "failed to delete the test event") | ||
|
|
||
| ginkgo.By("check that the list of events matches the requested quantity") | ||
|
|
||
| err = wait.PollImmediate(eventRetryPeriod, eventRetryTimeout, checkEventListQuantity(f, "testevent-set=true", 0)) | ||
| framework.ExpectNoError(err, "failed to count required events") | ||
| }) | ||
|
|
||
| }) | ||
|
|
||
| func checkEventListQuantity(f *framework.Framework, label string, quantity int) func() (bool, error) { | ||
| return func() (bool, error) { | ||
| var err error | ||
|
|
||
| framework.Logf("requesting list of events to confirm quantity") | ||
|
|
||
| eventList, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{ | ||
| LabelSelector: label}) | ||
|
|
||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| if len(eventList.Items) != quantity { | ||
| return false, err | ||
| } | ||
| return true, nil | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@johnbelamaric this is why we need your /approve for a PR that's just adding a new non-conformance test, @oomichi caught that we shouldn't have added a conformance test to the test/e2e/framework directory (ref: #91230 (comment)) so it's been moved to the correct file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops. ok. has it been running from there though? I mean, do we have soak time for this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i.e., it is added as a conformance test below. so I want to make sure it was actually running at some point as a non-conformance test. i can check the board