From fa753e67ae2bf573c9dfb1da1e1135c5ef5ef415 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 3 Dec 2014 17:52:06 -0800 Subject: [PATCH] Remove unnessary abstraction deepEqual Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) --- integration-cli/docker_cli_build_test.go | 3 ++- integration-cli/docker_cli_links_test.go | 5 +++-- integration-cli/utils.go | 4 ---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 1d287bd7dc..b76e1d4789 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -9,6 +9,7 @@ import ( "os/exec" "path" "path/filepath" + "reflect" "regexp" "strings" "syscall" @@ -1569,7 +1570,7 @@ func TestBuildWithVolumes(t *testing.T) { t.Fatal(err) } - equal := deepEqual(&expected, &result) + equal := reflect.DeepEqual(&result, &expected) if !equal { t.Fatalf("Volumes %s, expected %s", result, expected) diff --git a/integration-cli/docker_cli_links_test.go b/integration-cli/docker_cli_links_test.go index d412ef2a1a..50269245fe 100644 --- a/integration-cli/docker_cli_links_test.go +++ b/integration-cli/docker_cli_links_test.go @@ -4,6 +4,7 @@ import ( "io/ioutil" "os" "os/exec" + "reflect" "strings" "testing" "time" @@ -121,7 +122,7 @@ func TestLinksInspectLinksStarted(t *testing.T) { output := convertSliceOfStringsToMap(result) - equal := deepEqual(expected, output) + equal := reflect.DeepEqual(output, expected) if !equal { t.Fatalf("Links %s, expected %s", result, expected) @@ -150,7 +151,7 @@ func TestLinksInspectLinksStopped(t *testing.T) { output := convertSliceOfStringsToMap(result) - equal := deepEqual(expected, output) + equal := reflect.DeepEqual(output, expected) if !equal { t.Fatalf("Links %s, but expected %s", result, expected) diff --git a/integration-cli/utils.go b/integration-cli/utils.go index 3ff6d3c438..2de432549c 100644 --- a/integration-cli/utils.go +++ b/integration-cli/utils.go @@ -114,10 +114,6 @@ func unmarshalJSON(data []byte, result interface{}) error { return nil } -func deepEqual(expected interface{}, result interface{}) bool { - return reflect.DeepEqual(result, expected) -} - func convertSliceOfStringsToMap(input []string) map[string]struct{} { output := make(map[string]struct{}) for _, v := range input {