[alerts-dispatcher] update to build again :) also fixes a concurrent map access

go/src/infra/monitoring/analyzer/analyzer_test.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package analyzer
 
 import (
         "fmt"
         "infra/libs/testing/ansidiff"
         "infra/monitoring/client"
@@ skipping 89 matching lines @@
                         name:   "Stale master",
                         master: "fake.master",
                         be: messages.BuildExtract{
                                 CreatedTimestamp: messages.EpochTime(100),
                         },
                         t: time.Unix(100, 0).Add(20 * time.Minute),
                         want: []messages.Alert{
                                 {
                                         Key:       "stale master: fake.master",
                                         Title:     "Stale fake.master master data",
-                                        Body:      fmt.Sprintf("%s elapsed since last update.", 20*time.Minute),
+                                        Type:      "stale-master",
+                                        Severity:  staleMasterSev,
+                                        Body:      "0h 20m elapsed since last update.",
                                         Time:      messages.TimeToEpochTime(time.Unix(100, 0).Add(20 * time.Minute)),
                                         Links:     []messages.Link{{"Master", client.MasterURL("fake.master")}},
                                         StartTime: messages.EpochTime(100),
                                 },
                         },
                 },
                 {
                         name:   "Future master",
                         master: "fake.master",
                         be: messages.BuildExtract{
                                 CreatedTimestamp: messages.EpochTime(110),
                         },
                         t:    time.Unix(100, 0),
                         want: []messages.Alert{},
                 },
         }
 
         a := New(&mockReader{}, 0, 10)
 
         for _, test := range tests {
                 a.Now = fakeNow(test.t)
                 got := a.MasterAlerts(test.master, &test.be)
                 if !reflect.DeepEqual(got, test.want) {
-                        t.Errorf("%s failed. Got %+v, want: %+v", test.name, got, test.want)
+                        t.Errorf("%s failed. Got %+v, want: %+v\nDiff: %v", test.name, got, test.want,
+                                ansidiff.Diff(got, test.want))
                 }
         }
 }
 
 func TestBuilderAlerts(t *testing.T) {
         tests := []struct {
                 name         string
                 url          string
                 be           messages.BuildExtract
                 filter       string
@@ skipping 110 matching lines @@
                         b: messages.Builder{
                                 State:        messages.StateBuilding,
                                 BuilderName:  "fake.builder",
                                 CachedBuilds: []int64{0, 1},
                         },
                         time: time.Unix(0, 0).Add(4 * time.Hour),
                         wantAlerts: []messages.Alert{
                                 {
                                         Key:      "fake.master.fake.builder.hung",
                                         Title:    "fake.master.fake.builder is hung in step fake_step.",
+                                        Type:     "hung-builder",
                                         Time:     messages.TimeToEpochTime(time.Unix(0, 0).Add(4 * time.Hour)),
                                         Body:     "fake.master.fake.builder has been building for 3h59m50s (last step update 1970-01-01 00:00:10 +0000 UTC), past the alerting threshold of 3h0m0s",
-                                        Severity: 1,
+                                        Severity: hungBuilderSev,
                                         Links: []messages.Link{
                                                 {Title: "Builder", Href: "https://build.chromium.org/p/fake.master/builders/fake.builder"},
                                                 {Title: "Last build", Href: "https://build.chromium.org/p/fake.master/builders/fake.builder/builds/1"},
                                                 {Title: "Last build step", Href: "https://build.chromium.org/p/fake.master/builders/fake.builder/builds/1/steps/fake_step"},
                                         },
                                 },
                         },
                         wantErrs: []error{},
                 },
         }
 
         a := New(nil, 0, 10)
 
         for _, test := range tests {
                 a.Now = fakeNow(test.time)
                 a.Reader = mockReader{
                         builds: test.builds,
                 }
                 gotAlerts, gotErrs := a.builderAlerts(test.master, test.builder, &test.b)
                 if !reflect.DeepEqual(gotAlerts, test.wantAlerts) {
-                        t.Errorf("%s failed. Got:\n%+v, want:\n%+v", test.name, gotAlerts, test.wantAlerts)
+                        t.Errorf("%s failed. Got:\n%+v, want:\n%+v\nDiff: %v", test.name, gotAlerts, test.wantAlerts,
+                                ansidiff.Diff(gotAlerts, test.wantAlerts))
                 }
                 if !reflect.DeepEqual(gotErrs, test.wantErrs) {
                         t.Errorf("%s failed. Got %+v, want: %+v", test.name, gotErrs, test.wantErrs)
                 }
         }
 }
 
 func TestBuilderStepAlerts(t *testing.T) {
         tests := []struct {
                 name         string
@@ skipping 45 matching lines @@
                                                         {
                                                                 Repository: "testing.git",
                                                                 Revision:   "4242",
                                                         },
                                                 },
                                         },
                                 },
                         },
                         wantAlerts: []messages.Alert{
                                 {
-                                        Key:   "fake.master.fake.builder.fake_step",
-                                        Title: "Builder step failure: fake.master.fake.builder",
-                                        Type:  "buildfailure",
+                                        Key:      "fake.master.fake.builder.fake_step",
+                                        Title:    "fake.builder step failure",
+                                        Type:     "buildfailure",
+                                        Body:     "fake_step failing on fake.master/fake.builder",
+                                        Severity: newFailureSev,
                                         Extension: messages.BuildFailure{
                                                 Builders: []messages.AlertedBuilder{
                                                         {
                                                                 Name: "fake.builder",
                                                                 URL:  "https://build.chromium.org/p/fake.master/builders/fake.builder",
                                                         },
                                                 },
                                                 Reasons: []messages.Reason{
                                                         {
                                                                 Step: "fake_step",
@@ skipping 94 matching lines @@
                                                         {
                                                                 Repository: "testing2.git",
                                                                 Revision:   "4444",
                                                         },
                                                 },
                                         },
                                 },
                         },
                         wantAlerts: []messages.Alert{
                                 {
-                                        Key:   "fake.master.fake.builder.fake_step",
-                                        Title: "Builder step failure: fake.master.fake.builder",
-                                        Type:  "buildfailure",
+                                        Key:      "fake.master.fake.builder.fake_step",
+                                        Title:    "fake.builder step failure",
+                                        Type:     "buildfailure",
+                                        Body:     "fake_step failing on fake.master/fake.builder",
+                                        Severity: reliableFailureSev,
                                         Extension: messages.BuildFailure{
                                                 Builders: []messages.AlertedBuilder{
                                                         {
                                                                 Name:          "fake.builder",
                                                                 URL:           "https://build.chromium.org/p/fake.master/builders/fake.builder",
                                                                 FirstFailure:  0,
                                                                 LatestFailure: 3,
                                                         },
                                                 },
                                                 Reasons: []messages.Reason{
@@ skipping 186 matching lines @@
                                                 RegressionRanges: []messages.RegressionRange{
                                                         {
                                                                 Repo: "repo.c",
                                                         },
                                                 },
                                         },
                                 },
                         },
                         want: []messages.Alert{
                                 {
-                                        Title: "step_a (failing on 3 builders)",
+                                        Title: "step_a failing on 3 builders",
                                         Type:  "buildfailure",
+                                        Body:  "builder A, builder B, builder C",
                                         Extension: messages.BuildFailure{
                                                 Builders: []messages.AlertedBuilder{
                                                         {Name: "builder A"},
                                                         {Name: "builder B"},
                                                         {Name: "builder C"},
                                                 },
                                                 Reasons: []messages.Reason{
                                                         {
                                                                 Step: "step_a",
                                                         },
@@ skipping 18 matching lines @@
                                         },
                                 },
                         },
                 },
         }
 
         a := New(&mockReader{}, 0, 10)
         for _, test := range tests {
                 got := a.mergeAlertsByStep(test.in)
                 if !reflect.DeepEqual(got, test.want) {
-                        t.Errorf("%s failed. Got:\n\t%+v, want:\n\t%+v", test.name, got, test.want)
+                        t.Errorf("%s failed. Got:\n\t%+v, want:\n\t%+v\nDiff: %v", test.name, got, test.want, ansidiff.Diff(got, test.want))
                 }
         }
 }
 
 func TestUnexpected(t *testing.T) {
         tests := []struct {
                 name                   string
                 expected, actual, want []string
         }{
                 {
@@ skipping 183 matching lines @@
                                                 Number: 42,
                                         },
                                         step: messages.Step{
                                                 Name: "fake_tests",
                                         },
                                 },
                         },
                         testResults: messages.TestResults{},
                         alerts: []messages.Alert{
                                 {
-                                        Key:   "fake.master.fake.builder.fake_tests",
-                                        Title: "Builder step failure: fake.master.fake.builder",
-                                        Type:  "buildfailure",
+                                        Key:      "fake.master.fake.builder.fake_tests",
+                                        Title:    "fake.builder step failure",
+                                        Body:     "fake_tests failing on fake.master/fake.builder",
+                                        Severity: newFailureSev,
+                                        Type:     "buildfailure",
                                         Extension: messages.BuildFailure{
                                                 Builders: []messages.AlertedBuilder{
                                                         {
                                                                 Name:          "fake.builder",
                                                                 URL:           "https://build.chromium.org/p/fake.master/builders/fake.builder",
                                                                 FirstFailure:  42,
                                                                 LatestFailure: 42,
                                                         },
                                                 },
                                                 Reasons: []messages.Reason{
@@ skipping 10 matching lines @@
         }
 
         mc := &mockReader{}
         a := New(mc, 0, 10)
         a.Now = fakeNow(time.Unix(0, 0))
 
         for _, test := range tests {
                 mc.testResults = &test.testResults
                 alerts, err := a.stepFailureAlerts(test.failures)
                 if !reflect.DeepEqual(alerts, test.alerts) {
-                        t.Errorf("%s failed. Got:\n\t%+v, want:\n\t%+v", test.name, alerts, test.alerts)
+                        t.Errorf("%s failed. Got:\n\t%+v, want:\n\t%+v\nDiff: %s", test.name, alerts, test.alerts,
+                                ansidiff.Diff(alerts, test.alerts))
                 }
                 if !reflect.DeepEqual(err, test.err) {
                         t.Errorf("%s failed. Got %+v, want %+v", test.name, err, test.err)
                 }
         }
 }
 
 func TestLatestBuildStep(t *testing.T) {
         tests := []struct {
                 name       string
@@ skipping 125 matching lines @@
                 }
                 if gotErr != test.wantErr {
                         t.Errorf("%s failed. Got %s, want %s.", test.name, gotErr, test.wantErr)
                 }
         }
 }
 
 func TestExcludeFailure(t *testing.T) {
         tests := []struct {
                 name                  string
-                cfgs                  map[string]messages.MasterConfig
+                gk                    messages.GatekeeperConfig
                 master, builder, step string
                 want                  bool
         }{
                 {
                         name:    "empty config",
                         master:  "fake.master",
                         builder: "fake.builder",
                         step:    "fake_step",
                         want:    false,
                 },
                 {
                         name:    "specifically excluded builder",
                         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,
                 },
                 {
                         name:    "specifically excluded master step",
                         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,
                 },
                 {
                         name:    "specifically excluded builder step",
                         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,
                 },
                 {
                         name:    "wildcard builder excluded",
                         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)
                 }
         }
 }