Merge branch '18947-githttpd'

[arvados.git] / services / crunch-dispatch-local / crunch-dispatch-local_test.go

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local_test.go b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
index 6da17ea86cc06ccdbce21c37d2b703b1f937fded..e5ce5c66c5eb3f1d60ac2ae91edc54d14b68b71d 100644 (file)
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@ -16,11 +16,11 @@ import (
        "testing"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-       "git.curoverse.com/arvados.git/sdk/go/arvadostest"
-       "git.curoverse.com/arvados.git/sdk/go/dispatch"
-       "github.com/Sirupsen/logrus"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/arvadosclient"
+       "git.arvados.org/arvados.git/sdk/go/arvadostest"
+       "git.arvados.org/arvados.git/sdk/go/ctxlog"
+       "git.arvados.org/arvados.git/sdk/go/dispatch"
        . "gopkg.in/check.v1"
 )
 
@@ -39,22 +39,19 @@ var initialArgs []string
 
 func (s *TestSuite) SetUpSuite(c *C) {
        initialArgs = os.Args
-       arvadostest.StartAPI()
        runningCmds = make(map[string]*exec.Cmd)
-       logrus.SetFormatter(&logrus.TextFormatter{DisableColors: true})
-}
-
-func (s *TestSuite) TearDownSuite(c *C) {
-       arvadostest.StopAPI()
 }
 
 func (s *TestSuite) SetUpTest(c *C) {
+       arvadostest.ResetDB(c)
+       arvadostest.ResetEnv()
        args := []string{"crunch-dispatch-local"}
        os.Args = args
 }
 
 func (s *TestSuite) TearDownTest(c *C) {
        arvadostest.ResetEnv()
+       arvadostest.ResetDB(c)
        os.Args = initialArgs
 }
 
@@ -67,24 +64,27 @@ func (s *TestSuite) TestIntegration(c *C) {
        c.Assert(err, IsNil)
 
        echo := "echo"
-       crunchRunCommand = &echo
+       crunchRunCommand = echo
 
-       ctx, cancel := context.WithCancel(context.Background())
+       ctx, cancel := context.WithCancel(ctxlog.Context(context.Background(), ctxlog.TestLogger(c)))
        dispatcher := dispatch.Dispatcher{
                Arv:        arv,
                PollPeriod: time.Second,
-               RunContainer: func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
-                       run(d, c, s)
-                       cancel()
-               },
        }
 
-       startCmd = func(container arvados.Container, cmd *exec.Cmd) error {
+       startCmd := func(container arvados.Container, cmd *exec.Cmd) error {
                dispatcher.UpdateState(container.UUID, "Running")
                dispatcher.UpdateState(container.UUID, "Complete")
                return cmd.Start()
        }
 
+       cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
+
+       dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) error {
+               defer cancel()
+               return (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
+       }
+
        err = dispatcher.Run(ctx)
        c.Assert(err, Equals, context.Canceled)
 
@@ -166,27 +166,32 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
        }
 
        buf := bytes.NewBuffer(nil)
-       logrus.SetOutput(io.MultiWriter(buf, os.Stderr))
-       defer logrus.SetOutput(os.Stderr)
+       logger := ctxlog.TestLogger(c)
+       logger.SetOutput(io.MultiWriter(buf, logger.Out))
 
-       *crunchRunCommand = crunchCmd
+       crunchRunCommand = crunchCmd
 
-       ctx, cancel := context.WithCancel(context.Background())
+       ctx, cancel := context.WithCancel(ctxlog.Context(context.Background(), logger))
+       defer cancel()
        dispatcher := dispatch.Dispatcher{
+               Logger:     logger,
                Arv:        arv,
-               PollPeriod: time.Second / 20,
-               RunContainer: func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
-                       run(d, c, s)
-                       cancel()
-               },
+               PollPeriod: time.Second,
        }
 
-       startCmd = func(container arvados.Container, cmd *exec.Cmd) error {
+       startCmd := func(container arvados.Container, cmd *exec.Cmd) error {
                dispatcher.UpdateState(container.UUID, "Running")
                dispatcher.UpdateState(container.UUID, "Complete")
                return cmd.Start()
        }
 
+       cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
+
+       dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) error {
+               defer cancel()
+               return (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
+       }
+
        re := regexp.MustCompile(`(?ms).*` + expected + `.*`)
        go func() {
                for i := 0; i < 80 && !re.MatchString(buf.String()); i++ {
@@ -197,9 +202,8 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
 
        err := dispatcher.Run(ctx)
        c.Assert(err, Equals, context.Canceled)
+       c.Check(buf.String(), Matches, `(?ms).*`+expected+`.*`)
 
-       // Wait for all running crunch jobs to complete / terminate
+       c.Logf("test finished, waiting for running crunch jobs to complete / terminate")
        waitGroup.Wait()
-
-       c.Check(buf.String(), Matches, `(?ms).*`+expected+`.*`)
 }