projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15003: Fix import cycle.
[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 534de6916c52168465ee887c5600b0dab86c9000..41357403f0a01c9092e2ee7503e13943ba4c2cd3 100644
(file)
--- a/
services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/
services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@
-8,12
+8,11
@@
import (
"bytes"
"context"
"io"
"bytes"
"context"
"io"
- "log"
"net/http"
"net/http/httptest"
"os"
"os/exec"
"net/http"
"net/http/httptest"
"os"
"os/exec"
- "
strings
"
+ "
regexp
"
"testing"
"time"
"testing"
"time"
@@
-21,6
+20,7
@@
import (
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/dispatch"
"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"
. "gopkg.in/check.v1"
)
. "gopkg.in/check.v1"
)
@@
-41,6
+41,7
@@
func (s *TestSuite) SetUpSuite(c *C) {
initialArgs = os.Args
arvadostest.StartAPI()
runningCmds = make(map[string]*exec.Cmd)
initialArgs = os.Args
arvadostest.StartAPI()
runningCmds = make(map[string]*exec.Cmd)
+ logrus.SetFormatter(&logrus.TextFormatter{DisableColors: true})
}
func (s *TestSuite) TearDownSuite(c *C) {
}
func (s *TestSuite) TearDownSuite(c *C) {
@@
-72,18
+73,19
@@
func (s *TestSuite) TestIntegration(c *C) {
dispatcher := dispatch.Dispatcher{
Arv: arv,
PollPeriod: time.Second,
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()
}
dispatcher.UpdateState(container.UUID, "Running")
dispatcher.UpdateState(container.UUID, "Complete")
return cmd.Start()
}
+ dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
+ (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
+ cancel()
+ }
+
err = dispatcher.Run(ctx)
c.Assert(err, Equals, context.Canceled)
err = dispatcher.Run(ctx)
c.Assert(err, Equals, context.Canceled)
@@
-133,7
+135,7
@@
func (s *MockArvadosServerSuite) Test_ContainerStillInRunningAfterRun(c *C) {
arvadostest.StubResponse{200, string(`{"uuid":"zzzzz-dz642-xxxxxxxxxxxxxx2", "state":"Running", "priority":1, "locked_by_uuid": "` + arvadostest.Dispatch1AuthUUID + `"}`)}
testWithServerStub(c, apiStubResponses, "echo",
arvadostest.StubResponse{200, string(`{"uuid":"zzzzz-dz642-xxxxxxxxxxxxxx2", "state":"Running", "priority":1, "locked_by_uuid": "` + arvadostest.Dispatch1AuthUUID + `"}`)}
testWithServerStub(c, apiStubResponses, "echo",
- `
After echo process termination, container state for Running is "zzzzz-dz642-xxxxxxxxxxxxxx2". Updating it to "Cancelled
"`)
+ `
after \\"echo\\" process termination, container state for zzzzz-dz642-xxxxxxxxxxxxxx2 is \\"Running\\"; updating it to \\"Cancelled\\
"`)
}
func (s *MockArvadosServerSuite) Test_ErrorRunningContainer(c *C) {
}
func (s *MockArvadosServerSuite) Test_ErrorRunningContainer(c *C) {
@@
-144,7
+146,7
@@
func (s *MockArvadosServerSuite) Test_ErrorRunningContainer(c *C) {
apiStubResponses["/arvados/v1/containers/zzzzz-dz642-xxxxxxxxxxxxxx3/lock"] =
arvadostest.StubResponse{200, string(`{"uuid":"zzzzz-dz642-xxxxxxxxxxxxxx3", "state":"Locked", "priority":1}`)}
apiStubResponses["/arvados/v1/containers/zzzzz-dz642-xxxxxxxxxxxxxx3/lock"] =
arvadostest.StubResponse{200, string(`{"uuid":"zzzzz-dz642-xxxxxxxxxxxxxx3", "state":"Locked", "priority":1}`)}
- testWithServerStub(c, apiStubResponses, "nosuchcommand",
"Error starting nosuchcommand for zzzzz-dz642-xxxxxxxxxxxxxx3"
)
+ testWithServerStub(c, apiStubResponses, "nosuchcommand",
`error starting \\"nosuchcommand\\" for zzzzz-dz642-xxxxxxxxxxxxxx3`
)
}
func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubResponse, crunchCmd string, expected string) {
}
func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubResponse, crunchCmd string, expected string) {
@@
-165,29
+167,31
@@
func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
}
buf := bytes.NewBuffer(nil)
}
buf := bytes.NewBuffer(nil)
- log.SetOutput(io.MultiWriter(buf, os.Stderr))
- defer log.SetOutput(os.Stderr)
+ log
rus
.SetOutput(io.MultiWriter(buf, os.Stderr))
+ defer log
rus
.SetOutput(os.Stderr)
*crunchRunCommand = crunchCmd
ctx, cancel := context.WithCancel(context.Background())
dispatcher := dispatch.Dispatcher{
Arv: arv,
*crunchRunCommand = crunchCmd
ctx, cancel := context.WithCancel(context.Background())
dispatcher := dispatch.Dispatcher{
Arv: arv,
- PollPeriod: time.Duration(1) * time.Second,
- RunContainer: func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
- run(d, c, s)
- cancel()
- },
+ PollPeriod: time.Second / 20,
}
}
- 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()
}
dispatcher.UpdateState(container.UUID, "Running")
dispatcher.UpdateState(container.UUID, "Complete")
return cmd.Start()
}
+ dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
+ (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
+ cancel()
+ }
+
+ re := regexp.MustCompile(`(?ms).*` + expected + `.*`)
go func() {
go func() {
- for i := 0; i < 80 && !
strings.Contains(buf.String(), expected
); i++ {
+ for i := 0; i < 80 && !
re.MatchString(buf.String()
); i++ {
time.Sleep(100 * time.Millisecond)
}
cancel()
time.Sleep(100 * time.Millisecond)
}
cancel()