X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8685bdc41012f1623cc02b573e27439fdf314799..HEAD:/lib/dispatchcloud/worker/worker_test.go

diff --git a/lib/dispatchcloud/worker/worker_test.go b/lib/dispatchcloud/worker/worker_test.go
index 4134788b2e..5d8c67e916 100644
--- a/lib/dispatchcloud/worker/worker_test.go
+++ b/lib/dispatchcloud/worker/worker_test.go
@@ -14,24 +14,36 @@ import (
 	"time"
 
 	"git.arvados.org/arvados.git/lib/cloud"
+	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/lib/dispatchcloud/test"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/sirupsen/logrus"
 	check "gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&WorkerSuite{})
 
-type WorkerSuite struct{}
+type WorkerSuite struct {
+	logger      logrus.FieldLogger
+	testCluster *arvados.Cluster
+}
+
+func (suite *WorkerSuite) SetUpTest(c *check.C) {
+	suite.logger = ctxlog.TestLogger(c)
+	cfg, err := config.NewLoader(nil, suite.logger).Load()
+	c.Assert(err, check.IsNil)
+	suite.testCluster, err = cfg.GetCluster("")
+	c.Assert(err, check.IsNil)
+}
 
 func (suite *WorkerSuite) TestProbeAndUpdate(c *check.C) {
-	logger := ctxlog.TestLogger(c)
 	bootTimeout := time.Minute
 	probeTimeout := time.Second
 
 	ac := arvados.NewClientFromEnv()
-	is, err := (&test.StubDriver{}).InstanceSet(nil, "test-instance-set-id", nil, logger)
+	is, err := (&test.StubDriver{}).InstanceSet(nil, "test-instance-set-id", nil, suite.logger, nil)
 	c.Assert(err, check.IsNil)
 	inst, err := is.Create(arvados.InstanceType{}, "", nil, "echo InitCommand", nil)
 	c.Assert(err, check.IsNil)
@@ -110,6 +122,39 @@ func (suite *WorkerSuite) TestProbeAndUpdate(c *check.C) {
 			expectState:     StateUnknown,
 			expectRunning:   1,
 		},
+		{
+			testCaseComment: "Unknown, boot probe fails, deployRunner succeeds, container is running",
+			state:           StateUnknown,
+			respBoot:        respFail,
+			respRun:         respFail,
+			respRunDeployed: respContainerRunning,
+			deployRunner:    []byte("ELF"),
+			expectStdin:     []byte("ELF"),
+			expectState:     StateUnknown,
+			expectRunning:   1,
+		},
+		{
+			testCaseComment: "Unknown, boot timeout exceeded, boot probe fails but deployRunner succeeds and container is running",
+			state:           StateUnknown,
+			age:             bootTimeout * 2,
+			respBoot:        respFail,
+			respRun:         respFail,
+			respRunDeployed: respContainerRunning,
+			deployRunner:    []byte("ELF"),
+			expectStdin:     []byte("ELF"),
+			expectState:     StateUnknown,
+			expectRunning:   1,
+		},
+		{
+			testCaseComment: "Unknown, boot timeout exceeded, boot probe fails but deployRunner succeeds and no container is running",
+			state:           StateUnknown,
+			age:             bootTimeout * 2,
+			respBoot:        respFail,
+			respRun:         respFail,
+			deployRunner:    []byte("ELF"),
+			expectStdin:     []byte("ELF"),
+			expectState:     StateShutdown,
+		},
 		{
 			testCaseComment: "Booting, boot probe fails, run probe fails",
 			state:           StateBooting,
@@ -232,6 +277,7 @@ func (suite *WorkerSuite) TestProbeAndUpdate(c *check.C) {
 		wp := &Pool{
 			arvClient:        ac,
 			newExecutor:      func(cloud.Instance) Executor { return exr },
+			cluster:          suite.testCluster,
 			bootProbeCommand: "bootprobe",
 			timeoutBooting:   bootTimeout,
 			timeoutProbe:     probeTimeout,
@@ -249,7 +295,7 @@ func (suite *WorkerSuite) TestProbeAndUpdate(c *check.C) {
 			exr.response[wp.runnerCmd+" --list"] = trial.respRunDeployed
 		}
 		wkr := &worker{
-			logger:   logger,
+			logger:   suite.logger,
 			executor: exr,
 			wp:       wp,
 			mtx:      &wp.mtx,