projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10690-config-dump' refs #10690
[arvados.git]
/
services
/
crunch-dispatch-slurm
/
crunch-dispatch-slurm_test.go
diff --git
a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index c9208a6943924a1604c7b15735536229cde68104..40461031e214486f1dbed9feeda6aae0d97fb76c 100644
(file)
--- a/
services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/
services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@
-81,7
+81,8
@@
func (s *TestSuite) TestIntegrationCancel(c *C) {
return exec.Command("echo")
}
return exec.Command("echo")
}
- container := s.integrationTest(c, func() *exec.Cmd { return exec.Command("echo", "zzzzz-dz642-queuedcontainer") },
+ container := s.integrationTest(c,
+ func() *exec.Cmd { return exec.Command("echo", "zzzzz-dz642-queuedcontainer") },
[]string(nil),
func(dispatcher *dispatch.Dispatcher, container arvados.Container) {
dispatcher.UpdateState(container.UUID, dispatch.Running)
[]string(nil),
func(dispatcher *dispatch.Dispatcher, container arvados.Container) {
dispatcher.UpdateState(container.UUID, dispatch.Running)
@@
-134,7
+135,7
@@
func (s *TestSuite) integrationTest(c *C,
}(squeueCmd)
squeueCmd = newSqueueCmd
}(squeueCmd)
squeueCmd = newSqueueCmd
- // There should be
no queued containers now
+ // There should be
one queued container
params := arvadosclient.Dict{
"filters": [][]string{{"state", "=", "Queued"}},
}
params := arvadosclient.Dict{
"filters": [][]string{{"state", "=", "Queued"}},
}
@@
-318,7
+319,7
@@
func testSbatchFuncWithArgs(c *C, args []string) {
func (s *MockArvadosServerSuite) TestSbatchPartition(c *C) {
theConfig.SbatchArguments = nil
func (s *MockArvadosServerSuite) TestSbatchPartition(c *C) {
theConfig.SbatchArguments = nil
- container := arvados.Container{UUID: "123", RuntimeConstraints: arvados.RuntimeConstraints{RAM: 250000000, VCPUs: 1
, Partition
: []string{"blurb", "b2"}}}
+ container := arvados.Container{UUID: "123", RuntimeConstraints: arvados.RuntimeConstraints{RAM: 250000000, VCPUs: 1
}, SchedulingParameters: arvados.SchedulingParameters{Partitions
: []string{"blurb", "b2"}}}
sbatchCmd := sbatchFunc(container)
var expected []string
sbatchCmd := sbatchFunc(container)
var expected []string