Skip to content

Fix race conditions in TestTriggerAnnotateUserInfo #1246

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.

Sign up for GitHub

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

Merged
knative-prow-robot merged 1 commit into from
May 16, 2019
Merged

Fix race conditions in TestTriggerAnnotateUserInfo #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions pkg/apis/eventing/v1alpha1/trigger_defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,9 @@ import (
)

var (
defaultBroker = "default"
otherBroker = "other_broker"
defaultTriggerFilter = &TriggerFilter{
SourceAndType: &TriggerFilterSourceAndType{
Type: TriggerAnyFilter,
Source: TriggerAnyFilter},
}
defaultBroker = "default"
otherBroker = "other_broker"

otherTriggerFilter = &TriggerFilter{
SourceAndType: &TriggerFilterSourceAndType{
Type: "other_type",
Expand All @@ -39,7 +35,7 @@ var (
defaultTrigger = Trigger{
Spec: TriggerSpec{
Broker: defaultBroker,
Filter: defaultTriggerFilter,
Filter: defaultTriggerFilter(),
},
}
)
Expand All @@ -55,7 +51,7 @@ func TestTriggerDefaults(t *testing.T) {
},
"nil filter": {
initial: Trigger{Spec: TriggerSpec{Broker: otherBroker}},
expected: Trigger{Spec: TriggerSpec{Broker: otherBroker, Filter: defaultTriggerFilter}},
expected: Trigger{Spec: TriggerSpec{Broker: otherBroker, Filter: defaultTriggerFilter()}},
},
"nil broker and nil filter": {
initial: Trigger{},
Expand All @@ -71,3 +67,12 @@ func TestTriggerDefaults(t *testing.T) {
})
}
}

func defaultTriggerFilter() *TriggerFilter {
// Can't just be a package level var because it gets mutated.
return &TriggerFilter{
SourceAndType: &TriggerFilterSourceAndType{
Type: TriggerAnyFilter,
Source: TriggerAnyFilter},
}
}
83 changes: 43 additions & 40 deletions pkg/apis/eventing/v1alpha1/trigger_lifecycle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,47 +272,50 @@ func TestTriggerAnnotateUserInfo(t *testing.T) {
this *Trigger
prev *Trigger
wantedAnns map[string]string
}{{
"create new trigger",
u1,
&Trigger{},
nil,
map[string]string{
eventing.CreatorAnnotation: u1,
eventing.UpdaterAnnotation: u1,
},
}, {
"update trigger which has no annotations without diff",
u1,
&Trigger{Spec: TriggerSpec{Broker: defaultBroker, Filter: defaultTriggerFilter}},
&Trigger{Spec: TriggerSpec{Broker: defaultBroker, Filter: defaultTriggerFilter}},
map[string]string{},
}, {
"update trigger which has annotations without diff",
u2,
withUserAnns(u1, u1, &Trigger{Spec: TriggerSpec{Broker: defaultBroker, Filter: defaultTriggerFilter}}),
withUserAnns(u1, u1, &Trigger{Spec: TriggerSpec{Broker: defaultBroker, Filter: defaultTriggerFilter}}),
map[string]string{
eventing.CreatorAnnotation: u1,
eventing.UpdaterAnnotation: u1,
},
}, {
"update trigger which has no annotations with diff",
u2,
&Trigger{Spec: TriggerSpec{Broker: defaultBroker}},
&Trigger{Spec: TriggerSpec{Broker: otherBroker}},
map[string]string{
eventing.UpdaterAnnotation: u2,
}}, {
"update trigger which has annotations with diff",
u3,
withUserAnns(u1, u2, &Trigger{Spec: TriggerSpec{Broker: otherBroker}}),
withUserAnns(u1, u2, &Trigger{Spec: TriggerSpec{Broker: defaultBroker}}),
map[string]string{
eventing.CreatorAnnotation: u1,
eventing.UpdaterAnnotation: u3,
}{
{
name: "create new trigger",
user: u1,
this: &Trigger{},
prev: nil,
wantedAnns: map[string]string{
eventing.CreatorAnnotation: u1,
eventing.UpdaterAnnotation: u1,
},
}, {
name: "update trigger which has no annotations without diff",
user: u1,
this: &Trigger{Spec: TriggerSpec{Broker: defaultBroker, Filter: defaultTriggerFilter()}},
prev: &Trigger{Spec: TriggerSpec{Broker: defaultBroker, Filter: defaultTriggerFilter()}},
wantedAnns: map[string]string{},
}, {
name: "update trigger which has annotations without diff",
user: u2,
this: withUserAnns(u1, u1, &Trigger{Spec: TriggerSpec{Broker: defaultBroker, Filter: defaultTriggerFilter()}}),
prev: withUserAnns(u1, u1, &Trigger{Spec: TriggerSpec{Broker: defaultBroker, Filter: defaultTriggerFilter()}}),
wantedAnns: map[string]string{
eventing.CreatorAnnotation: u1,
eventing.UpdaterAnnotation: u1,
},
}, {
name: "update trigger which has no annotations with diff",
user: u2,
this: &Trigger{Spec: TriggerSpec{Broker: defaultBroker}},
prev: &Trigger{Spec: TriggerSpec{Broker: otherBroker}},
wantedAnns: map[string]string{
eventing.UpdaterAnnotation: u2,
},
}, {
name: "update trigger which has annotations with diff",
user: u3,
this: withUserAnns(u1, u2, &Trigger{Spec: TriggerSpec{Broker: otherBroker}}),
prev: withUserAnns(u1, u2, &Trigger{Spec: TriggerSpec{Broker: defaultBroker}}),
wantedAnns: map[string]string{
eventing.CreatorAnnotation: u1,
eventing.UpdaterAnnotation: u3,
},
},
}}
}

for _, test := range tests {
test := test
Expand Down