suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2024-11-12 13:48:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare returns exit code 1 when not matching

Browse Source
This commit is contained in:
Mike Farah 2020-02-28 15:49:34 +11:00
parent 69caccd2d3
commit a4fa8f1341
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/commands_test.go
View File

@ -94,12 +94,21 @@ func TestReadCmd(t *testing.T) {
test.AssertResult(t, "2\n", result.Output) test.AssertResult(t, "2\n", result.Output)
} }
func TestCompareCmd(t *testing.T) { func TestCompareSameCmd(t *testing.T) {
cmd := getRootCommand() cmd := getRootCommand()
result := test.RunCmd(cmd, "compare ../examples/data1.yaml ../examples/data3.yaml") result := test.RunCmd(cmd, "compare ../examples/data1.yaml ../examples/data1.yaml")
if result.Error != nil { if result.Error != nil {
t.Error(result.Error) t.Error(result.Error)
} }
expectedOutput := ``
test.AssertResult(t, expectedOutput, result.Output)
}
func TestCompareDifferentCmd(t *testing.T) {
forceOsExit = false
cmd := getRootCommand()
result := test.RunCmd(cmd, "compare ../examples/data1.yaml ../examples/data3.yaml")
expectedOutput := `-a: simple # just the best expectedOutput := `-a: simple # just the best
-b: [1, 2] -b: [1, 2]
+a: "simple" # just the best +a: "simple" # just the best
@ -111,6 +120,7 @@ func TestCompareCmd(t *testing.T) {
} }
func TestComparePrettyCmd(t *testing.T) { func TestComparePrettyCmd(t *testing.T) {
forceOsExit = false
cmd := getRootCommand() cmd := getRootCommand()
result := test.RunCmd(cmd, "compare -P ../examples/data1.yaml ../examples/data3.yaml") result := test.RunCmd(cmd, "compare -P ../examples/data1.yaml ../examples/data3.yaml")
if result.Error != nil { if result.Error != nil {
@ -128,6 +138,7 @@ func TestComparePrettyCmd(t *testing.T) {
} }
func TestComparePathsCmd(t *testing.T) { func TestComparePathsCmd(t *testing.T) {
forceOsExit = false
cmd := getRootCommand() cmd := getRootCommand()
result := test.RunCmd(cmd, "compare -P -ppv ../examples/data1.yaml ../examples/data3.yaml **") result := test.RunCmd(cmd, "compare -P -ppv ../examples/data1.yaml ../examples/data3.yaml **")
if result.Error != nil { if result.Error != nil {

15
cmd/compare.go
View File

@ -3,6 +3,7 @@ package cmd
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"os"
"strings" "strings"
"github.com/kylelemons/godebug/diff" "github.com/kylelemons/godebug/diff"
@ -11,6 +12,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
// turn off for unit tests :(
var forceOsExit = true
func createCompareCmd() *cobra.Command { func createCompareCmd() *cobra.Command {
var cmdCompare = &cobra.Command{ var cmdCompare = &cobra.Command{
Use: "compare [yaml_file_a] [yaml_file_b]", Use: "compare [yaml_file_a] [yaml_file_b]",
@ -70,7 +74,14 @@ func compareDocuments(cmd *cobra.Command, args []string) error {
return errorDoingThings return errorDoingThings
} }
cmd.Print(diff.Diff(strings.TrimSuffix(dataBufferA.String(), "\n"), strings.TrimSuffix(dataBufferB.String(), "\n"))) diffString := diff.Diff(strings.TrimSuffix(dataBufferA.String(), "\n"), strings.TrimSuffix(dataBufferB.String(), "\n"))
cmd.Print("\n")
if len(diffString) > 1 {
cmd.Print(diffString)
cmd.Print("\n")
if forceOsExit {
os.Exit(1)
}
}
return nil return nil
} }