lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

integration/dhcpv4: print unified line-wise diff

Browse Source 
This is much more readable than the go-cmp Diff() output when dealing with
[]string lines.
This commit is contained in:
Michael Stapelberg 2018-11-18 14:29:30 +01:00
parent fac1bf231e
commit 30e9a6677b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
integration/dhcpv4/dhcpv4_test.go
View File

@ -26,6 +26,7 @@ import (
"github.com/rtr7/router7/internal/dhcp4" "github.com/rtr7/router7/internal/dhcp4"
"github.com/rtr7/router7/internal/testing/dnsmasq" "github.com/rtr7/router7/internal/testing/dnsmasq"
"github.com/andreyvit/diff"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
) )
@ -165,7 +166,10 @@ func TestDHCPv4(t *testing.T) {
trimSpace := func(line string) string { trimSpace := func(line string) string {
return strings.TrimSpace(line) return strings.TrimSpace(line)
} }
if diff := cmp.Diff(got, want, cmp.Transformer("TrimSpace", trimSpace)); diff != "" { if !cmp.Equal(got, want, cmp.Transformer("TrimSpace", trimSpace)) {
t.Errorf("dnsmasq log does not contain expected DHCP sequence: diff (-got +want):\n%s", diff) t.Errorf("dnsmasq log does not contain expected DHCP sequence: diff (-got +want):\n%s",
diff.LineDiff(
strings.Join(diff.TrimLines(got), "\n"),
strings.Join(diff.TrimLines(want), "\n")))
} }
} }