9272: Simplify json decoding with Unmarshal.

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index bbd375e8a4c0a92336ad764aa85b45423c0b449a..998c4bc17a16f8f932c4ae7adf2469222a0eab4e 100644 (file)
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -505,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()
@@ -644,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()
@@ -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()