projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12934: Fix gofmt
[arvados.git]
/
services
/
crunch-run
/
crunchrun_test.go
diff --git
a/services/crunch-run/crunchrun_test.go
b/services/crunch-run/crunchrun_test.go
index 4d76e34f4c2b743a2637260c592213d7b3cd3ea6..ab7417e542bee44fa2346e50a97732ec3b41304b 100644
(file)
--- a/
services/crunch-run/crunchrun_test.go
+++ b/
services/crunch-run/crunchrun_test.go
@@
-951,7
+951,7
@@
func (s *TestSuite) testStopContainer(c *C, setup func(cr *ContainerRunner)) {
c.Check(api.CalledWith("container.log", nil), NotNil)
c.Check(api.CalledWith("container.state", "Cancelled"), NotNil)
c.Check(api.CalledWith("container.log", nil), NotNil)
c.Check(api.CalledWith("container.state", "Cancelled"), NotNil)
- c.Check(
strings.HasSuffix(api.Logs["stdout"].String(), "foo\n"), Equals, true
)
+ c.Check(
api.Logs["stdout"].String(), Matches, "(?ms).*foo\n$"
)
}
func (s *TestSuite) TestFullRunSetEnv(c *C) {
}
func (s *TestSuite) TestFullRunSetEnv(c *C) {
@@
-1270,6
+1270,7
@@
func (s *TestSuite) TestSetupMounts(c *C) {
i = 0
cr.ArvMountPoint = ""
(*GitMountSuite)(nil).useTestGitServer(c)
i = 0
cr.ArvMountPoint = ""
(*GitMountSuite)(nil).useTestGitServer(c)
+ cr.token = arvadostest.ActiveToken
cr.Container.Mounts = make(map[string]arvados.Mount)
cr.Container.Mounts = map[string]arvados.Mount{
"/tip": {
cr.Container.Mounts = make(map[string]arvados.Mount)
cr.Container.Mounts = map[string]arvados.Mount{
"/tip": {
@@
-1279,11
+1280,10
@@
func (s *TestSuite) TestSetupMounts(c *C) {
Path: "/",
},
"/non-tip": {
Path: "/",
},
"/non-tip": {
- Kind: "git_tree",
- UUID: arvadostest.Repository2UUID,
- Commit: "5ebfab0522851df01fec11ec55a6d0f4877b542e",
- Path: "/",
- Writable: true,
+ Kind: "git_tree",
+ UUID: arvadostest.Repository2UUID,
+ Commit: "5ebfab0522851df01fec11ec55a6d0f4877b542e",
+ Path: "/",
},
}
cr.OutputPath = "/tmp"
},
}
cr.OutputPath = "/tmp"