Milo: Move buildbucket pubsub sub from buildbucket project to milo project

milo/common/pubsub_test.go

 // Copyright 2017 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 common
 
 import (
         "errors"
         "fmt"
         "testing"
 
         "cloud.google.com/go/pubsub"
         "golang.org/x/net/context"
 
         "github.com/luci/gae/impl/memory"
+        luciErrors "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/logging/gologger"
 
         . "github.com/smartystreets/goconvey/convey"
 )
 
 type testPubSubClient struct {
         topics         map[string]error
         subscriptions  map[string]error
         createdSubsErr map[string]error
         createdSubs    map[string]pubsub.SubscriptionConfig
@@ skipping 28 matching lines @@
         }
         panic(fmt.Errorf("test error: unknown created sub %s", id))
 }
 
 func TestPubSub(t *testing.T) {
         t.Parallel()
 
         Convey("Test Environment", t, func() {
                 c := memory.UseWithAppID(context.Background(), "dev~luci-milo")
                 c = gologger.StdConfig.Use(c)
-                client := &testPubSubClient{
+                miloClient := &testPubSubClient{
                         topics:         map[string]error{},
                         subscriptions:  map[string]error{},
                         createdSubsErr: map[string]error{},
                         createdSubs:    map[string]pubsub.SubscriptionConfig{}}
-                c = context.WithValue(c, &pubSubClientKey, client)
+                bbClient := &testPubSubClient{
+                        topics:         map[string]error{},
+                        subscriptions:  map[string]error{},
+                        createdSubsErr: map[string]error{},
+                        createdSubs:    map[string]pubsub.SubscriptionConfig{}}
+                clients := newClientsBundle()
+                clients.clients["buildbucket"] = bbClient
+                clients.clients["luci-milo"] = miloClient
+                c = context.WithValue(c, &pubSubClientKey, clients)
 
                 Convey("Buildbucket PubSub subscriber", func() {
-                        proj := "foo"
+                        proj := "buildbucket"
                         Convey("Non-existant topic", func() {
-                                client.topics["builds"] = errNotExist
+                                bbClient.topics["builds"] = errNotExist
                                 err := ensureBuildbucketSubscribed(c, proj)
                                 So(err.Error(), ShouldEndWith, "does not exist")
                         })
                         Convey("Permission denied", func() {
                                 pErr := errors.New(
                                         "something PermissionDenied something")
-                                client.topics["builds"] = pErr
+                                bbClient.topics["builds"] = pErr
                                 err := ensureBuildbucketSubscribed(c, proj)
                                 So(err, ShouldEqual, pErr)
                         })
                         Convey("Normal error", func() {
                                 pErr := errors.New("foobar")
-                                client.topics["builds"] = pErr
+                                bbClient.topics["builds"] = pErr
                                 err := ensureBuildbucketSubscribed(c, proj)
                                 So(err, ShouldEqual, pErr)
                         })
-                        client.topics["builds"] = nil
+                        bbClient.topics["builds"] = nil
                         Convey("Subscription exists", func() {
-                                client.subscriptions["luci-milo"] = nil
+                                miloClient.subscriptions["buildbucket"] = nil
                                 err := ensureBuildbucketSubscribed(c, proj)
                                 So(err, ShouldBeNil)
-                                So(len(client.createdSubs), ShouldEqual, 0)
+                                So(len(miloClient.createdSubs), ShouldEqual, 0)
+                                So(len(bbClient.createdSubs), ShouldEqual, 0)
                         })
-                        client.subscriptions["luci-milo"] = errNotExist
+                        miloClient.subscriptions["buildbucket"] = errNotExist
                         Convey("Not registered", func() {
                                 errNotReg := errors.New("The supplied HTTP URL is not registered")
-                                client.createdSubsErr["luci-milo"] = errNotReg
+                                miloClient.createdSubsErr["buildbucket"] = errNotReg
                                 err := ensureBuildbucketSubscribed(c, proj)
-                                So(err, ShouldEqual, errNotReg)
+                                So((err.(luciErrors.Wrapped)).InnerError(), ShouldEqual, errNotReg)
                         })
                         Convey("Create subscription", func() {
-                                client.createdSubsErr["luci-milo"] = nil
+                                miloClient.createdSubsErr["buildbucket"] = nil
                                 err := ensureBuildbucketSubscribed(c, proj)
                                 So(err, ShouldBeNil)
-                                So(len(client.createdSubs), ShouldEqual, 1)
-                                _, ok := client.createdSubs["luci-milo"]
+                                So(len(miloClient.createdSubs), ShouldEqual, 1)
+                                _, ok := miloClient.createdSubs["buildbucket"]
                                 So(ok, ShouldEqual, true)
                         })
                 })
         })
 
 }