| Index: go/src/infra/monitoring/analyzer/analyzer_test.go
|
| diff --git a/go/src/infra/monitoring/analyzer/analyzer_test.go b/go/src/infra/monitoring/analyzer/analyzer_test.go
|
| index b59ca284464ba45acc15c105fb7906c7e44cebbc..fd8cb404456aae1dcb3e8177cd0414c425f16179 100644
|
| --- a/go/src/infra/monitoring/analyzer/analyzer_test.go
|
| +++ b/go/src/infra/monitoring/analyzer/analyzer_test.go
|
| @@ -1100,7 +1100,7 @@ func TestLatestBuildStep(t *testing.T) {
|
| func TestExcludeFailure(t *testing.T) {
|
| tests := []struct {
|
| name string
|
| - cfgs map[string]messages.MasterConfig
|
| + gk messages.GatekeeperConfig
|
| master, builder, step string
|
| want bool
|
| }{
|
| @@ -1116,11 +1116,11 @@ func TestExcludeFailure(t *testing.T) {
|
| master: "fake.master",
|
| builder: "fake.builder",
|
| step: "fake_step",
|
| - cfgs: map[string]messages.MasterConfig{
|
| - "fake.master": {
|
| + gk: messages.GatekeeperConfig{Masters: map[string][]messages.MasterConfig{
|
| + "fake.master": {{
|
| ExcludedBuilders: []string{"fake.builder"},
|
| - },
|
| - },
|
| + }},
|
| + }},
|
| want: true,
|
| },
|
| {
|
| @@ -1128,11 +1128,11 @@ func TestExcludeFailure(t *testing.T) {
|
| master: "fake.master",
|
| builder: "fake.builder",
|
| step: "fake_step",
|
| - cfgs: map[string]messages.MasterConfig{
|
| - "fake.master": {
|
| + gk: messages.GatekeeperConfig{Masters: map[string][]messages.MasterConfig{
|
| + "fake.master": {{
|
| ExcludedSteps: []string{"fake_step"},
|
| - },
|
| - },
|
| + }},
|
| + }},
|
| want: true,
|
| },
|
| {
|
| @@ -1140,14 +1140,14 @@ func TestExcludeFailure(t *testing.T) {
|
| master: "fake.master",
|
| builder: "fake.builder",
|
| step: "fake_step",
|
| - cfgs: map[string]messages.MasterConfig{
|
| - "fake.master": {
|
| + gk: messages.GatekeeperConfig{Masters: map[string][]messages.MasterConfig{
|
| + "fake.master": {{
|
| Builders: map[string]messages.BuilderConfig{
|
| "fake.builder": {
|
| ExcludedSteps: []string{"fake_step"},
|
| },
|
| - },
|
| - },
|
| + }},
|
| + }},
|
| },
|
| want: true,
|
| },
|
| @@ -1156,19 +1156,19 @@ func TestExcludeFailure(t *testing.T) {
|
| master: "fake.master",
|
| builder: "fake.builder",
|
| step: "fake_step",
|
| - cfgs: map[string]messages.MasterConfig{
|
| - "fake.master": {
|
| + gk: messages.GatekeeperConfig{Masters: map[string][]messages.MasterConfig{
|
| + "fake.master": {{
|
| ExcludedBuilders: []string{"*"},
|
| - },
|
| - },
|
| + }},
|
| + }},
|
| want: true,
|
| },
|
| }
|
|
|
| a := New(&mockReader{}, 0, 10)
|
| for _, test := range tests {
|
| - a.MasterCfgs = test.cfgs
|
| - got := a.excludeFailure(test.master, test.builder, test.step)
|
| + a.Gatekeeper = NewGatekeeperRules(test.gk)
|
| + got := a.Gatekeeper.ExcludeFailure(test.master, test.builder, test.step)
|
| if got != test.want {
|
| t.Errorf("%s failed. Got: %+v, want: %+v", test.name, got, test.want)
|
| }
|
|
|