Remove unnecessary json.Unmarshal wrapper.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fb42e8477208badf0714a9d8ae20946a9b531dba
Component: engine

components/engine/pkg/integration/utils.go

@@ -3,7 +3,6 @@ package integration
 import (
 	"archive/tar"
 	"bytes"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -209,15 +208,6 @@ func RunCommandPipelineWithOutput(cmds ...*exec.Cmd) (output string, exitCode in
 	return RunCommandWithOutput(cmds[len(cmds)-1])
 }
 
-// UnmarshalJSON deserialize a JSON in the given interface.
-func UnmarshalJSON(data []byte, result interface{}) error {
-	if err := json.Unmarshal(data, result); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // ConvertSliceOfStringsToMap converts a slices of string in a map
 // with the strings as key and an empty string as values.
 func ConvertSliceOfStringsToMap(input []string) map[string]struct{} {

components/engine/pkg/integration/utils_test.go

@@ -294,21 +294,6 @@ func TestRunCommandPipelineWithOutput(t *testing.T) {
 	}
 }
 
-// Simple simple test as it is just a passthrough for json.Unmarshal
-func TestUnmarshalJSON(t *testing.T) {
-	emptyResult := struct{}{}
-	if err := UnmarshalJSON([]byte(""), &emptyResult); err == nil {
-		t.Fatalf("Expected an error, got nothing")
-	}
-	result := struct{ Name string }{}
-	if err := UnmarshalJSON([]byte(`{"name": "name"}`), &result); err != nil {
-		t.Fatal(err)
-	}
-	if result.Name != "name" {
-		t.Fatalf("Expected result.name to be 'name', was '%s'", result.Name)
-	}
-}
-
 func TestConvertSliceOfStringsToMap(t *testing.T) {
 	input := []string{"a", "b"}
 	actual := ConvertSliceOfStringsToMap(input)