Milo: Add machine pool info for buildbot builder view.

milo/appengine/buildbot/pubsub_test.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package buildbot
 
 import (
         "bytes"
         "compress/zlib"
         "encoding/base64"
@@ skipping 95 matching lines @@
                                                         {
                                                                 Source: buildbotSourceStamp{
                                                                         Changes: []buildbotChange{{Comments: "foo"}},
                                                                 },
                                                         },
                                                 },
                                         },
                                 },
                         }
                         So(putDSMasterJSON(c, m, false), ShouldBeNil)
-                        lm, _, err := getMasterJSON(c, "fake")
+                        lm, _, _, err := getMasterJSON(c, "fake")
                         So(err, ShouldBeNil)
                         So(lm.Builders["fake builder"].PendingBuildStates[0].Source.Changes[0].Comments, ShouldResemble, "")
                 })
 
                 Convey("Save build entry", func() {
                         build := &buildbotBuild{
                                 Master:      "Fake Master",
                                 Buildername: "Fake buildername",
                                 Number:      1234,
                                 Currentstep: "this is a string",
@@ skipping 124 matching lines @@
                         Convey("And stores correctly", func() {
                                 loadB := &buildbotBuild{
                                         Master:      "Fake Master",
                                         Buildername: "Fake buildername",
                                         Number:      1234,
                                 }
                                 err := ds.Get(c, loadB)
                                 So(err, ShouldBeNil)
                                 So(loadB.Master, ShouldEqual, "Fake Master")
                                 So(loadB.Currentstep.(string), ShouldEqual, "this is a string")
-                                m, t, err := getMasterJSON(c, "Fake Master")
+                                m, _, t, err := getMasterJSON(c, "Fake Master")
                                 So(err, ShouldBeNil)
                                 So(t.Unix(), ShouldEqual, 981173106)
                                 So(m.Name, ShouldEqual, "Fake Master")
                                 So(m.Project.Title, ShouldEqual, "some title")
                                 So(m.Slaves["testslave"].Name, ShouldEqual, "testslave")
                                 So(len(m.Slaves["testslave"].Runningbuilds), ShouldEqual, 0)
                                 So(len(m.Slaves["testslave"].RunningbuildsMap), ShouldEqual, 1)
                                 So(m.Slaves["testslave"].RunningbuildsMap["Fake buildername"][0],
                                         ShouldEqual, 2222)
                         })
 
                         Convey("And a new master overwrites", func() {
                                 c, _ = testclock.UseTime(c, fakeTime.Add(time.Duration(1*time.Second)))
                                 ms.Project.Title = "some other title"
                                 h = httptest.NewRecorder()
                                 r := &http.Request{
                                         Body: newCombinedPsBody([]*buildbotBuild{b}, &ms, false)}
                                 p = httprouter.Params{}
                                 PubSubHandler(&router.Context{
                                         Context: c,
                                         Writer:  h,
                                         Request: r,
                                         Params:  p,
                                 })
                                 So(h.Code, ShouldEqual, 200)
-                                m, t, err := getMasterJSON(c, "Fake Master")
+                                m, _, t, err := getMasterJSON(c, "Fake Master")
                                 So(err, ShouldBeNil)
                                 So(m.Project.Title, ShouldEqual, "some other title")
                                 So(t.Unix(), ShouldEqual, 981173107)
                                 So(m.Name, ShouldEqual, "Fake Master")
                         })
                         Convey("And a new build overwrites", func() {
                                 b.Times = buildbotTimesFinished(123.0, 124.0)
                                 h = httptest.NewRecorder()
                                 r = &http.Request{
                                         Body: newCombinedPsBody([]*buildbotBuild{b}, &ms, false),
@@ skipping 173 matching lines @@
                                 loadB := &buildbotBuild{
                                         Master:      "Fake Master",
                                         Buildername: "Fake buildername",
                                         Number:      1234,
                                 }
                                 err = ds.Get(c, loadB)
                                 So(err, ShouldBeNil)
                                 So(loadB.Master, ShouldEqual, "Fake Master")
                                 So(loadB.Internal, ShouldEqual, true)
                                 So(loadB.Currentstep.(string), ShouldEqual, "this is a string")
-                                m, t, err := getMasterJSON(c, "Fake Master")
+                                m, _, t, err := getMasterJSON(c, "Fake Master")
                                 So(err, ShouldBeNil)
                                 So(t.Unix(), ShouldEqual, 981173106)
                                 So(m.Name, ShouldEqual, "Fake Master")
                                 So(m.Project.Title, ShouldEqual, "some title")
                                 So(m.Slaves["testslave"].Name, ShouldEqual, "testslave")
                                 So(len(m.Slaves["testslave"].Runningbuilds), ShouldEqual, 0)
                                 So(len(m.Slaves["testslave"].RunningbuildsMap), ShouldEqual, 1)
                                 So(m.Slaves["testslave"].RunningbuildsMap["Fake buildername"][0],
                                         ShouldEqual, 2222)
                         })
                 })
         })
 }