tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests 

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
This commit is contained in:
Ulysses Souza 2020-09-30 11:00:48 +02:00
parent ef5e013aa7
commit fb59c9385d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/cmd/version_test.go
View File

@ -31,7 +31,7 @@ func TestVersionFormat(t *testing.T) {
jsonCases := []caze{ jsonCases := []caze{
{ {
Actual: fixedJSONArgs([]string{}), Actual: fixedJSONArgs([]string{}),
Expected: nil, Expected: []string{},
}, },
{ {
Actual: fixedJSONArgs([]string{ Actual: fixedJSONArgs([]string{
@ -103,7 +103,7 @@ func TestVersionFormat(t *testing.T) {
prettyCases := []caze{ prettyCases := []caze{
{ {
Actual: fixedPrettyArgs([]string{}), Actual: fixedPrettyArgs([]string{}),
Expected: nil, Expected: []string{},
}, },
{ {
Actual: fixedPrettyArgs([]string{ Actual: fixedPrettyArgs([]string{
@ -172,7 +172,7 @@ func TestVersionFormat(t *testing.T) {
"--format", "--format",
"pretty", "pretty",
}), }),
Expected: nil, Expected: []string{},
}, },
} }

4
formatter/json.go
View File

@ -18,16 +18,12 @@ package formatter
import ( import (
"encoding/json" "encoding/json"
"reflect"
) )
const standardIndentation = " " const standardIndentation = " "
// ToStandardJSON return a string with the JSON representation of the interface{} // ToStandardJSON return a string with the JSON representation of the interface{}
func ToStandardJSON(i interface{}) (string, error) { func ToStandardJSON(i interface{}) (string, error) {
if reflect.ValueOf(i).IsNil() {
return "{}", nil
}
b, err := json.MarshalIndent(i, "", standardIndentation) b, err := json.MarshalIndent(i, "", standardIndentation)
if err != nil { if err != nil {
return "", err return "", err