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 8fbf536a39933fb724e416a35c84eadf590db74b..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(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) {
@@ -1280,11 +1280,10 @@ func (s *TestSuite) TestSetupMounts(c *C) {
                                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"