X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/215d15bc03a38be1965a5d9df21417a3f7eae032..2887fa9c26cfd4ae6379e2cf4e6c5d50aaa0dd11:/lib/dispatchcloud/dispatcher_test.go diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go index 7268f106a9..00157b75c6 100644 --- a/lib/dispatchcloud/dispatcher_test.go +++ b/lib/dispatchcloud/dispatcher_test.go @@ -17,6 +17,7 @@ import ( "git.curoverse.com/arvados.git/lib/dispatchcloud/test" "git.curoverse.com/arvados.git/sdk/go/arvados" + "git.curoverse.com/arvados.git/sdk/go/arvadostest" "git.curoverse.com/arvados.git/sdk/go/ctxlog" "golang.org/x/crypto/ssh" check "gopkg.in/check.v1" @@ -49,12 +50,13 @@ func (s *DispatcherSuite) SetUpTest(c *check.C) { s.cluster = &arvados.Cluster{ CloudVMs: arvados.CloudVMs{ - Driver: "test", - SyncInterval: arvados.Duration(10 * time.Millisecond), - TimeoutIdle: arvados.Duration(150 * time.Millisecond), - TimeoutBooting: arvados.Duration(150 * time.Millisecond), - TimeoutProbe: arvados.Duration(15 * time.Millisecond), - TimeoutShutdown: arvados.Duration(5 * time.Millisecond), + Driver: "test", + SyncInterval: arvados.Duration(10 * time.Millisecond), + TimeoutIdle: arvados.Duration(150 * time.Millisecond), + TimeoutBooting: arvados.Duration(150 * time.Millisecond), + TimeoutProbe: arvados.Duration(15 * time.Millisecond), + TimeoutShutdown: arvados.Duration(5 * time.Millisecond), + MaxCloudOpsPerSecond: 500, }, Dispatch: arvados.Dispatch{ PrivateKey: string(dispatchprivraw), @@ -80,10 +82,19 @@ func (s *DispatcherSuite) SetUpTest(c *check.C) { DispatchCloud: arvados.SystemServiceInstance{Listen: ":"}, }, }, + Services: arvados.Services{ + Controller: arvados.Service{ExternalURL: arvados.URL{Scheme: "https", Host: os.Getenv("ARVADOS_API_HOST")}}, + }, } + + arvClient, err := arvados.NewClientFromConfig(s.cluster) + c.Check(err, check.IsNil) + s.disp = &dispatcher{ - Cluster: s.cluster, - Context: s.ctx, + Cluster: s.cluster, + Context: s.ctx, + ArvClient: arvClient, + AuthToken: arvadostest.AdminToken, } // Test cases can modify s.cluster before calling // initialize(), and then modify private state before calling @@ -155,6 +166,8 @@ func (s *DispatcherSuite) TestDispatchToStubDriver(c *check.C) { stubvm.Broken = time.Now().Add(time.Duration(rand.Int63n(90)) * time.Millisecond) case 1: stubvm.CrunchRunMissing = true + case 2: + stubvm.ReportBroken = time.Now().Add(time.Duration(rand.Int63n(200)) * time.Millisecond) default: stubvm.CrunchRunCrashRate = 0.1 }