X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b3dbac2705f2bcffbf346d0b7efb85e2566b11f8..b105602902e38f18a48505e2091ffea77b2c7c89:/lib/dispatchcloud/dispatcher_test.go?ds=inline

diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index 737688023d..9ef170e46d 100644
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -16,7 +16,7 @@ import (
 
 	"git.curoverse.com/arvados.git/lib/dispatchcloud/test"
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh"
 	check "gopkg.in/check.v1"
 )
@@ -43,17 +43,18 @@ func (s *DispatcherSuite) SetUpTest(c *check.C) {
 
 	_, hostpriv := test.LoadTestKey(c, "test/sshkey_vm")
 	s.stubDriver = &test.StubDriver{
-		HostKey:          hostpriv,
-		AuthorizedKeys:   []ssh.PublicKey{dispatchpub},
-		ErrorRateDestroy: 0.1,
+		HostKey:                   hostpriv,
+		AuthorizedKeys:            []ssh.PublicKey{dispatchpub},
+		ErrorRateDestroy:          0.1,
+		MinTimeBetweenCreateCalls: time.Millisecond,
 	}
 
 	s.cluster = &arvados.Cluster{
 		CloudVMs: arvados.CloudVMs{
 			Driver:          "test",
 			SyncInterval:    arvados.Duration(10 * time.Millisecond),
-			TimeoutIdle:     arvados.Duration(30 * time.Millisecond),
-			TimeoutBooting:  arvados.Duration(30 * 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),
 		},
@@ -126,6 +127,7 @@ func (s *DispatcherSuite) TestDispatchToStubDriver(c *check.C) {
 		defer mtx.Unlock()
 		if _, ok := waiting[ctr.UUID]; !ok {
 			c.Logf("container completed twice: %s -- perhaps completed after stub instance was killed?", ctr.UUID)
+			return 1
 		}
 		delete(waiting, ctr.UUID)
 		if len(waiting) == 0 {
@@ -227,11 +229,11 @@ func (s *DispatcherSuite) TestInstancesAPI(c *check.C) {
 
 	type instance struct {
 		Instance             string
-		WorkerState          string
+		WorkerState          string `json:"worker_state"`
 		Price                float64
-		LastContainerUUID    string
-		ArvadosInstanceType  string
-		ProviderInstanceType string
+		LastContainerUUID    string `json:"last_container_uuid"`
+		ArvadosInstanceType  string `json:"arvados_instance_type"`
+		ProviderInstanceType string `json:"provider_instance_type"`
 	}
 	type instancesResponse struct {
 		Items []instance
@@ -253,8 +255,8 @@ func (s *DispatcherSuite) TestInstancesAPI(c *check.C) {
 
 	ch := s.disp.pool.Subscribe()
 	defer s.disp.pool.Unsubscribe(ch)
-	err := s.disp.pool.Create(test.InstanceType(1))
-	c.Check(err, check.IsNil)
+	ok := s.disp.pool.Create(test.InstanceType(1))
+	c.Check(ok, check.Equals, true)
 	<-ch
 
 	sr = getInstances()