Skip to content

Commit b26c782

Browse files
heysteheyste
committed
Relocate tests from framework/events/events.go & update polling check
1 parent ecb6874 commit b26c782

File tree

2 files changed

+194
-167
lines changed

2 files changed

+194
-167
lines changed

‎test/e2e/apimachinery/events.go‎

Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
/*
2+
Copyright 2016 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package apimachinery
18+
19+
import (
20+
"context"
21+
"encoding/json"
22+
"time"
23+
24+
v1 "k8s.io/api/core/v1"
25+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
26+
"k8s.io/apimachinery/pkg/util/wait"
27+
"k8s.io/kubernetes/test/e2e/framework"
28+
29+
"github.com/onsi/ginkgo"
30+
"k8s.io/apimachinery/pkg/types"
31+
)
32+
33+
const (
34+
eventRetryPeriod = 1 * time.Second
35+
eventRetryTimeout = 1 * time.Minute
36+
)
37+
38+
var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
39+
f := framework.NewDefaultFramework("events")
40+
41+
/*
42+
Release : v1.19
43+
Testname: Event resource lifecycle
44+
Description: Create an event, the event MUST exist.
45+
The event is patched with a new message, the check MUST have the update message.
46+
The event is deleted and MUST NOT show up when listing all events.
47+
*/
48+
framework.ConformanceIt("should ensure that an event can be fetched, patched, deleted, and listed", func() {
49+
eventTestName := "event-test"
50+
51+
ginkgo.By("creating a test event")
52+
// create a test event in test namespace
53+
_, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{
54+
ObjectMeta: metav1.ObjectMeta{
55+
Name: eventTestName,
56+
Labels: map[string]string{
57+
"testevent-constant": "true",
58+
},
59+
},
60+
Message: "This is a test event",
61+
Reason: "Test",
62+
Type: "Normal",
63+
Count: 1,
64+
InvolvedObject: v1.ObjectReference{
65+
Namespace: f.Namespace.Name,
66+
},
67+
}, metav1.CreateOptions{})
68+
framework.ExpectNoError(err, "failed to create test event")
69+
70+
ginkgo.By("listing all events in all namespaces")
71+
// get a list of Events in all namespaces to ensure endpoint coverage
72+
eventsList, err := f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{
73+
LabelSelector: "testevent-constant=true",
74+
})
75+
framework.ExpectNoError(err, "failed list all events")
76+
77+
foundCreatedEvent := false
78+
var eventCreatedName string
79+
for _, val := range eventsList.Items {
80+
if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
81+
foundCreatedEvent = true
82+
eventCreatedName = val.ObjectMeta.Name
83+
break
84+
}
85+
}
86+
framework.ExpectEqual(foundCreatedEvent, true, "unable to find the test event")
87+
88+
ginkgo.By("patching the test event")
89+
// patch the event's message
90+
eventPatchMessage := "This is a test event - patched"
91+
eventPatch, err := json.Marshal(map[string]interface{}{
92+
"message": eventPatchMessage,
93+
})
94+
framework.ExpectNoError(err, "failed to marshal the patch JSON payload")
95+
96+
_, err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Patch(context.TODO(), eventTestName, types.StrategicMergePatchType, []byte(eventPatch), metav1.PatchOptions{})
97+
framework.ExpectNoError(err, "failed to patch the test event")
98+
99+
ginkgo.By("fetching the test event")
100+
// get event by name
101+
event, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Get(context.TODO(), eventCreatedName, metav1.GetOptions{})
102+
framework.ExpectNoError(err, "failed to fetch the test event")
103+
framework.ExpectEqual(event.Message, eventPatchMessage, "test event message does not match patch message")
104+
105+
ginkgo.By("deleting the test event")
106+
// delete original event
107+
err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Delete(context.TODO(), eventCreatedName, metav1.DeleteOptions{})
108+
framework.ExpectNoError(err, "failed to delete the test event")
109+
110+
ginkgo.By("listing all events in all namespaces")
111+
// get a list of Events list namespace
112+
eventsList, err = f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{
113+
LabelSelector: "testevent-constant=true",
114+
})
115+
framework.ExpectNoError(err, "fail to list all events")
116+
foundCreatedEvent = false
117+
for _, val := range eventsList.Items {
118+
if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
119+
foundCreatedEvent = true
120+
break
121+
}
122+
}
123+
framework.ExpectEqual(foundCreatedEvent, false, "should not have found test event after deletion")
124+
})
125+
126+
ginkgo.It("should delete a collection of events", func() {
127+
eventTestNames := []string{"test-event-1", "test-event-2", "test-event-3"}
128+
129+
ginkgo.By("Create set of events")
130+
// create a test event in test namespace
131+
for _, eventTestName := range eventTestNames {
132+
eventMessage := "This is " + eventTestName
133+
_, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{
134+
135+
ObjectMeta: metav1.ObjectMeta{
136+
Name: eventTestName,
137+
Labels: map[string]string{"testevent-set": "true"},
138+
},
139+
Message: eventMessage,
140+
Reason: "Test",
141+
Type: "Normal",
142+
Count: 1,
143+
InvolvedObject: v1.ObjectReference{
144+
Namespace: f.Namespace.Name,
145+
},
146+
}, metav1.CreateOptions{})
147+
framework.ExpectNoError(err, "failed to create event")
148+
framework.Logf("created %v", eventTestName)
149+
}
150+
151+
ginkgo.By("get a list of Events with a label in the current namespace")
152+
// get a list of events
153+
eventList, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{
154+
LabelSelector: "testevent-set=true",
155+
})
156+
framework.ExpectNoError(err, "failed to get a list of events")
157+
158+
framework.ExpectEqual(len(eventList.Items), len(eventTestNames), "looking for expected number of pod templates events")
159+
160+
ginkgo.By("delete collection of events")
161+
// delete collection
162+
163+
framework.Logf("requesting DeleteCollection of events")
164+
err = f.ClientSet.CoreV1().Events(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{
165+
LabelSelector: "testevent-set=true"})
166+
framework.ExpectNoError(err, "failed to delete the test event")
167+
168+
ginkgo.By("check that the list of events matches the requested quantity")
169+
170+
err = wait.PollImmediate(eventRetryPeriod, eventRetryTimeout, checkEventListQuantity(f, "testevent-set=true", 0))
171+
framework.ExpectNoError(err, "failed to count required events")
172+
})
173+
174+
})
175+
176+
func checkEventListQuantity(f *framework.Framework, label string, quantity int) func() (bool, error) {
177+
return func() (bool, error) {
178+
var err error
179+
180+
framework.Logf("requesting list of events to confirm quantity")
181+
182+
eventList, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{
183+
LabelSelector: label})
184+
185+
if err != nil {
186+
return false, err
187+
}
188+
189+
if len(eventList.Items) != quantity {
190+
return false, err
191+
}
192+
return true, nil
193+
}
194+
}

‎test/e2e/framework/events/events.go‎

Lines changed: 0 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -18,168 +18,18 @@ package events
1818

1919
import (
2020
"context"
21-
"encoding/json"
2221
"fmt"
2322
"strings"
2423
"time"
2524

26-
v1 "k8s.io/api/core/v1"
2725
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2826
"k8s.io/apimachinery/pkg/util/wait"
2927
clientset "k8s.io/client-go/kubernetes"
30-
"k8s.io/kubernetes/test/e2e/framework"
31-
32-
"github.com/onsi/ginkgo"
33-
"k8s.io/apimachinery/pkg/types"
34-
)
35-
36-
const (
37-
eventRetryPeriod = 1 * time.Second
38-
eventRetryTimeout = 1 * time.Minute
3928
)
4029

4130
// Action is a function to be performed by the system.
4231
type Action func() error
4332

44-
var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
45-
f := framework.NewDefaultFramework("events")
46-
47-
/*
48-
Release : v1.19
49-
Testname: Event resource lifecycle
50-
Description: Create an event, the event MUST exist.
51-
The event is patched with a new message, the check MUST have the update message.
52-
The event is deleted and MUST NOT show up when listing all events.
53-
*/
54-
framework.ConformanceIt("should ensure that an event can be fetched, patched, deleted, and listed", func() {
55-
eventTestName := "event-test"
56-
57-
ginkgo.By("creating a test event")
58-
// create a test event in test namespace
59-
_, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{
60-
ObjectMeta: metav1.ObjectMeta{
61-
Name: eventTestName,
62-
Labels: map[string]string{
63-
"testevent-constant": "true",
64-
},
65-
},
66-
Message: "This is a test event",
67-
Reason: "Test",
68-
Type: "Normal",
69-
Count: 1,
70-
InvolvedObject: v1.ObjectReference{
71-
Namespace: f.Namespace.Name,
72-
},
73-
}, metav1.CreateOptions{})
74-
framework.ExpectNoError(err, "failed to create test event")
75-
76-
ginkgo.By("listing all events in all namespaces")
77-
// get a list of Events in all namespaces to ensure endpoint coverage
78-
eventsList, err := f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{
79-
LabelSelector: "testevent-constant=true",
80-
})
81-
framework.ExpectNoError(err, "failed list all events")
82-
83-
foundCreatedEvent := false
84-
var eventCreatedName string
85-
for _, val := range eventsList.Items {
86-
if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
87-
foundCreatedEvent = true
88-
eventCreatedName = val.ObjectMeta.Name
89-
break
90-
}
91-
}
92-
framework.ExpectEqual(foundCreatedEvent, true, "unable to find the test event")
93-
94-
ginkgo.By("patching the test event")
95-
// patch the event's message
96-
eventPatchMessage := "This is a test event - patched"
97-
eventPatch, err := json.Marshal(map[string]interface{}{
98-
"message": eventPatchMessage,
99-
})
100-
framework.ExpectNoError(err, "failed to marshal the patch JSON payload")
101-
102-
_, err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Patch(context.TODO(), eventTestName, types.StrategicMergePatchType, []byte(eventPatch), metav1.PatchOptions{})
103-
framework.ExpectNoError(err, "failed to patch the test event")
104-
105-
ginkgo.By("fetching the test event")
106-
// get event by name
107-
event, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Get(context.TODO(), eventCreatedName, metav1.GetOptions{})
108-
framework.ExpectNoError(err, "failed to fetch the test event")
109-
framework.ExpectEqual(event.Message, eventPatchMessage, "test event message does not match patch message")
110-
111-
ginkgo.By("deleting the test event")
112-
// delete original event
113-
err = f.ClientSet.CoreV1().Events(f.Namespace.Name).Delete(context.TODO(), eventCreatedName, metav1.DeleteOptions{})
114-
framework.ExpectNoError(err, "failed to delete the test event")
115-
116-
ginkgo.By("listing all events in all namespaces")
117-
// get a list of Events list namespace
118-
eventsList, err = f.ClientSet.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{
119-
LabelSelector: "testevent-constant=true",
120-
})
121-
framework.ExpectNoError(err, "fail to list all events")
122-
foundCreatedEvent = false
123-
for _, val := range eventsList.Items {
124-
if val.ObjectMeta.Name == eventTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
125-
foundCreatedEvent = true
126-
break
127-
}
128-
}
129-
framework.ExpectEqual(foundCreatedEvent, false, "should not have found test event after deletion")
130-
})
131-
132-
ginkgo.It("should delete a collection of events", func() {
133-
eventTestNames := []string{"test-event-1", "test-event-2", "test-event-3"}
134-
135-
ginkgo.By("Create set of events")
136-
// create a test event in test namespace
137-
for _, eventTestName := range eventTestNames {
138-
eventMessage := "This is " + eventTestName
139-
_, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).Create(context.TODO(), &v1.Event{
140-
141-
ObjectMeta: metav1.ObjectMeta{
142-
Name: eventTestName,
143-
Labels: map[string]string{"testevent-set": "true"},
144-
},
145-
Message: eventMessage,
146-
Reason: "Test",
147-
Type: "Normal",
148-
Count: 1,
149-
InvolvedObject: v1.ObjectReference{
150-
Namespace: f.Namespace.Name,
151-
},
152-
}, metav1.CreateOptions{})
153-
framework.ExpectNoError(err, "failed to create event")
154-
framework.Logf("created %v", eventTestName)
155-
}
156-
157-
ginkgo.By("get a list of Events with a label in the current namespace")
158-
// get a list of events
159-
eventList, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{
160-
LabelSelector: "testevent-set=true",
161-
})
162-
framework.ExpectNoError(err, "failed to get a list of events")
163-
164-
framework.ExpectEqual(len(eventList.Items), len(eventTestNames), "looking for expected number of pod templates events")
165-
166-
ginkgo.By("delete collection of events")
167-
// confirm that delete collection does remove all events
168-
169-
err = wait.PollImmediate(eventRetryPeriod, eventRetryTimeout, deleteEventCollection(f, "testevent-set=true"))
170-
framework.ExpectNoError(err, "failed to delete collection")
171-
172-
ginkgo.By("get a list of Events with a label in the current namespace")
173-
// get list of events
174-
eventList, err = f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{
175-
LabelSelector: "testevent-set=true",
176-
})
177-
framework.ExpectNoError(err, "failed to get a list of events")
178-
179-
framework.ExpectEqual(len(eventList.Items), 0, "events should all be deleted")
180-
})
181-
182-
})
18333

18434
// WaitTimeoutForEvent waits the given timeout duration for an event to occur.
18535
func WaitTimeoutForEvent(c clientset.Interface, namespace, eventSelector, msg string, timeout time.Duration) error {
@@ -202,20 +52,3 @@ func eventOccurred(c clientset.Interface, namespace, eventSelector, msg string)
20252
return false, nil
20353
}
20454
}
205-
206-
func deleteEventCollection(f *framework.Framework, label string) func() (bool, error) {
207-
return func() (bool, error) {
208-
var err error
209-
210-
framework.Logf("requesting DeleteCollection of events")
211-
212-
err = f.ClientSet.CoreV1().Events(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{
213-
LabelSelector: label})
214-
215-
if err != nil {
216-
return false, err
217-
}
218-
return true, nil
219-
220-
}
221-
}

0 commit comments

Comments
 (0)