9272: Skip slow test when running -short tests.

[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 7194f2f1edc5c910b912a5b274cab82f84a953bd..998c4bc17a16f8f932c4ae7adf2469222a0eab4e 100644 (file)
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -423,6 +423,9 @@ func (s *TestSuite) TestRunContainer(c *C) {
        err := cr.LoadImage()
        c.Check(err, IsNil)
 
+       err = cr.CreateContainer()
+       c.Check(err, IsNil)
+
        err = cr.StartContainer()
        c.Check(err, IsNil)
 
@@ -475,7 +478,7 @@ func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) {
        *cr.ExitCode = 42
        cr.finalState = "Complete"
 
-       err := cr.UpdateContainerRecordComplete()
+       err := cr.UpdateContainerRecordFinal()
        c.Check(err, IsNil)
 
        c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], Equals, *cr.LogsPDH)
@@ -490,7 +493,7 @@ func (s *TestSuite) TestUpdateContainerRecordCancelled(c *C) {
        cr.Cancelled = true
        cr.finalState = "Cancelled"
 
-       err := cr.UpdateContainerRecordComplete()
+       err := cr.UpdateContainerRecordFinal()
        c.Check(err, IsNil)
 
        c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], IsNil)
@@ -502,7 +505,7 @@ func (s *TestSuite) TestUpdateContainerRecordCancelled(c *C) {
 // dress rehearsal of the Run() function, starting from a JSON container record.
 func FullRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner) {
        rec := ContainerRecord{}
-       err := json.NewDecoder(strings.NewReader(record)).Decode(&rec)
+       err := json.Unmarshal([]byte(record), &rec)
        c.Check(err, IsNil)
 
        docker := NewTestDockerClient()
@@ -641,7 +644,7 @@ func (s *TestSuite) TestCancel(c *C) {
 }`
 
        rec := ContainerRecord{}
-       err := json.NewDecoder(strings.NewReader(record)).Decode(&rec)
+       err := json.Unmarshal([]byte(record), &rec)
        c.Check(err, IsNil)
 
        docker := NewTestDockerClient()
@@ -668,10 +671,6 @@ func (s *TestSuite) TestCancel(c *C) {
        err = cr.Run()
 
        c.Check(err, IsNil)
-
-       c.Check(api.Calls, Equals, 6)
-       c.Check(api.Content[5]["container"].(arvadosclient.Dict)["log"], NotNil)
-
        if err != nil {
                for k, v := range api.Logs {
                        c.Log(k)
@@ -679,8 +678,9 @@ func (s *TestSuite) TestCancel(c *C) {
                }
        }
 
+       c.Assert(api.Calls, Equals, 6)
+       c.Check(api.Content[5]["container"].(arvadosclient.Dict)["log"], IsNil)
        c.Check(api.Content[5]["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled")
-
        c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "foo\n"), Equals, true)
 
 }
@@ -809,7 +809,7 @@ func (s *TestSuite) TestStdout(c *C) {
 // Used by the TestStdoutWithWrongPath*()
 func StdoutErrorRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, err error) {
        rec := ContainerRecord{}
-       err = json.NewDecoder(strings.NewReader(record)).Decode(&rec)
+       err = json.Unmarshal([]byte(record), &rec)
        c.Check(err, IsNil)
 
        docker := NewTestDockerClient()