From 30e9a6677b78d310f5e9fe3e1893854ee250a274 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Nov 2018 14:29:30 +0100 Subject: [PATCH] integration/dhcpv4: print unified line-wise diff This is much more readable than the go-cmp Diff() output when dealing with []string lines. --- integration/dhcpv4/dhcpv4_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/integration/dhcpv4/dhcpv4_test.go b/integration/dhcpv4/dhcpv4_test.go index 5a8fee5..3305e32 100644 --- a/integration/dhcpv4/dhcpv4_test.go +++ b/integration/dhcpv4/dhcpv4_test.go @@ -26,6 +26,7 @@ import ( "github.com/rtr7/router7/internal/dhcp4" "github.com/rtr7/router7/internal/testing/dnsmasq" + "github.com/andreyvit/diff" "github.com/google/go-cmp/cmp" ) @@ -165,7 +166,10 @@ func TestDHCPv4(t *testing.T) { trimSpace := func(line string) string { return strings.TrimSpace(line) } - if diff := cmp.Diff(got, want, cmp.Transformer("TrimSpace", trimSpace)); diff != "" { - t.Errorf("dnsmasq log does not contain expected DHCP sequence: diff (-got +want):\n%s", 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.LineDiff( + strings.Join(diff.TrimLines(got), "\n"), + strings.Join(diff.TrimLines(want), "\n"))) } }