Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2990)

Unified Diff: milo/appengine/swarming/buildinfo_test.go

Issue 2695383002: milo: Enable Swarming LogDog log loading. (Closed)
Patch Set: Comments, fix links. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: milo/appengine/swarming/buildinfo_test.go
diff --git a/milo/appengine/swarming/buildinfo_test.go b/milo/appengine/swarming/buildinfo_test.go
index 1b808cf0232398f526d0b160044ca3d9a0bd00f7..62caa104c3e9453b68e78999e680dc1d9d9c1613 100644
--- a/milo/appengine/swarming/buildinfo_test.go
+++ b/milo/appengine/swarming/buildinfo_test.go
@@ -11,42 +11,17 @@ import (
swarming "github.com/luci/luci-go/common/api/swarming/swarming/v1"
miloProto "github.com/luci/luci-go/common/proto/milo"
"github.com/luci/luci-go/logdog/api/endpoints/coordinator/logs/v1"
- "github.com/luci/luci-go/logdog/api/logpb"
"github.com/luci/luci-go/logdog/client/coordinator"
milo "github.com/luci/luci-go/milo/api/proto"
"github.com/luci/gae/impl/memory"
- "github.com/golang/protobuf/proto"
"golang.org/x/net/context"
- "google.golang.org/grpc"
. "github.com/luci/luci-go/common/testing/assertions"
. "github.com/smartystreets/goconvey/convey"
)
-// testLogDogClient is a minimal functional LogsClient implementation.
-//
-// It retains its latest input parameter and returns its configured err (if not
-// nil) or resp.
-type testLogDogClient struct {
- logdog.LogsClient
-
- req interface{}
- resp interface{}
- err error
-}
-
-func (tc *testLogDogClient) Tail(ctx context.Context, in *logdog.TailRequest, opts ...grpc.CallOption) (
- *logdog.GetResponse, error) {
-
- tc.req = in
- if tc.err != nil {
- return nil, tc.err
- }
- return tc.resp.(*logdog.GetResponse), nil
-}
-
type testSwarmingService struct {
swarmingService
@@ -69,31 +44,6 @@ func (sf *testSwarmingService) getSwarmingRequest(c context.Context, taskID stri
return &sf.req, nil
}
-func datagramGetResponse(project, prefix string, msg proto.Message) *logdog.GetResponse {
- data, err := proto.Marshal(msg)
- if err != nil {
- panic(err)
- }
- return &logdog.GetResponse{
- Project: project,
- Desc: &logpb.LogStreamDescriptor{
- Prefix: prefix,
- ContentType: miloProto.ContentTypeAnnotations,
- StreamType: logpb.StreamType_DATAGRAM,
- },
- State: &logdog.LogStreamState{},
- Logs: []*logpb.LogEntry{
- {
- Content: &logpb.LogEntry_Datagram{
- Datagram: &logpb.Datagram{
- Data: data,
- },
- },
- },
- },
- }
-}
-
func TestBuildInfo(t *testing.T) {
t.Parallel()
@@ -124,11 +74,16 @@ func TestBuildInfo(t *testing.T) {
},
}
bip := BuildInfoProvider{
- LogdogClientFunc: func(context.Context) (*coordinator.Client, error) {
- return &coordinator.Client{
- C: &testClient,
- Host: "example.com",
- }, nil
+ bl: buildLoader{
+ logDogClientFunc: func(c context.Context, host string) (*coordinator.Client, error) {
+ if host == "" {
+ host = "example.com"
+ }
+ return &coordinator.Client{
+ C: &testClient,
+ Host: host,
+ }, nil
+ },
},
swarmingServiceFunc: func(context.Context, string) (swarmingService, error) {
return &testSvc, nil
« no previous file with comments | « milo/appengine/swarming/buildinfo.go ('k') | milo/appengine/swarming/expectations/build-running-logdog.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698