github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Rename metav1.Event to metav1.WatchEvent to avoid swagger collision

Browse Source 
The kind on this object was always WatchEvent
This commit is contained in:
Clayton Coleman
2017-01-05 15:10:34 -05:00
parent c5d755dbec
commit f07c6486ba
13 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/serialization_test.go
View File

@@ -444,7 +444,7 @@ func TestObjectWatchFraming(t *testing.T) {
if err := embedded.Encode(v1secret, obj); err != nil {
t.Fatal(err)
}
event := &metav1.Event{Type: string(watch.Added)}
event := &metav1.WatchEvent{Type: string(watch.Added)}
event.Object.Raw = obj.Bytes()
obj = &bytes.Buffer{}
if err := s.Encode(event, obj); err != nil {
@@ -456,7 +456,7 @@ func TestObjectWatchFraming(t *testing.T) {
t.Fatal(err)
}
sr = streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s)
outEvent := &metav1.Event{}
outEvent := &metav1.WatchEvent{}
res, _, err = sr.Decode(nil, outEvent)
if err != nil || outEvent.Type != string(watch.Added) {
t.Fatalf("%v: %#v", err, outEvent)