projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11158: Support incremental update of project contents based on websocket events.
[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 ed13a4109c4dc829581d0fb36d935de972f7a46e..1a2787c25c625d3af04ab51655879ab13c9cbf82 100644
(file)
--- a/
services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/
services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@
-1,12
+1,12
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package main
import (
"bytes"
package main
import (
"bytes"
- "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"
- . "gopkg.in/check.v1"
+ "context"
"io"
"log"
"net/http"
"io"
"log"
"net/http"
@@
-16,6
+16,12
@@
import (
"strings"
"testing"
"time"
"strings"
"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"
+ . "gopkg.in/check.v1"
)
// Gocheck boilerplate
)
// Gocheck boilerplate
@@
-62,14
+68,13
@@
func (s *TestSuite) TestIntegration(c *C) {
echo := "echo"
crunchRunCommand = &echo
echo := "echo"
crunchRunCommand = &echo
+ ctx, cancel := context.WithCancel(context.Background())
dispatcher := dispatch.Dispatcher{
Arv: arv,
PollPeriod: time.Second,
dispatcher := dispatch.Dispatcher{
Arv: arv,
PollPeriod: time.Second,
- RunContainer: func(dispatcher *dispatch.Dispatcher,
- container arvados.Container,
- status chan arvados.Container) {
- run(dispatcher, container, status)
- dispatcher.Stop()
+ RunContainer: func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
+ run(d, c, s)
+ cancel()
},
}
},
}
@@
-79,8
+84,8
@@
func (s *TestSuite) TestIntegration(c *C) {
return cmd.Start()
}
return cmd.Start()
}
- err = dispatcher.Run()
- c.Assert(err,
IsNil
)
+ err = dispatcher.Run(
ctx
)
+ c.Assert(err,
Equals, context.Canceled
)
// Wait for all running crunch jobs to complete / terminate
waitGroup.Wait()
// Wait for all running crunch jobs to complete / terminate
waitGroup.Wait()
@@
-115,7
+120,7
@@
func (s *MockArvadosServerSuite) Test_APIErrorUpdatingContainerState(c *C) {
apiStubResponses["/arvados/v1/containers/zzzzz-dz642-xxxxxxxxxxxxxx1"] =
arvadostest.StubResponse{500, string(`{}`)}
apiStubResponses["/arvados/v1/containers/zzzzz-dz642-xxxxxxxxxxxxxx1"] =
arvadostest.StubResponse{500, string(`{}`)}
- testWithServerStub(c, apiStubResponses, "echo", "
E
rror locking container zzzzz-dz642-xxxxxxxxxxxxxx1")
+ testWithServerStub(c, apiStubResponses, "echo", "
e
rror locking container zzzzz-dz642-xxxxxxxxxxxxxx1")
}
func (s *MockArvadosServerSuite) Test_ContainerStillInRunningAfterRun(c *C) {
}
func (s *MockArvadosServerSuite) Test_ContainerStillInRunningAfterRun(c *C) {
@@
-165,14
+170,13
@@
func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
*crunchRunCommand = crunchCmd
*crunchRunCommand = crunchCmd
+ ctx, cancel := context.WithCancel(context.Background())
dispatcher := dispatch.Dispatcher{
Arv: arv,
PollPeriod: time.Duration(1) * time.Second,
dispatcher := dispatch.Dispatcher{
Arv: arv,
PollPeriod: time.Duration(1) * time.Second,
- RunContainer: func(dispatcher *dispatch.Dispatcher,
- container arvados.Container,
- status chan arvados.Container) {
- run(dispatcher, container, status)
- dispatcher.Stop()
+ RunContainer: func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
+ run(d, c, s)
+ cancel()
},
}
},
}
@@
-186,11
+190,11
@@
func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
for i := 0; i < 80 && !strings.Contains(buf.String(), expected); i++ {
time.Sleep(100 * time.Millisecond)
}
for i := 0; i < 80 && !strings.Contains(buf.String(), expected); i++ {
time.Sleep(100 * time.Millisecond)
}
-
dispatcher.Stop
()
+
cancel
()
}()
}()
- err := dispatcher.Run()
- c.Assert(err,
IsNil
)
+ err := dispatcher.Run(
ctx
)
+ c.Assert(err,
Equals, context.Canceled
)
// Wait for all running crunch jobs to complete / terminate
waitGroup.Wait()
// Wait for all running crunch jobs to complete / terminate
waitGroup.Wait()