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

change diff order to -want +got

Browse Source 
This is easier to read and consistent with how we do things at work.
This commit is contained in:
Michael Stapelberg 2019-07-11 08:42:21 +02:00
parent 414a7c025b
commit c0067c5aa5
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/dhcpv4/dhcpv4_test.go
View File

@ -166,8 +166,8 @@ func TestDHCPv4(t *testing.T) {
trimSpace := func(line string) string { trimSpace := func(line string) string {
return strings.TrimSpace(line) return strings.TrimSpace(line)
} }
if !cmp.Equal(got, want, cmp.Transformer("TrimSpace", trimSpace)) { if !cmp.Equal(want, got, cmp.Transformer("TrimSpace", trimSpace)) {
t.Errorf("dnsmasq log does not contain expected DHCP sequence: diff (-got +want):\n%s", t.Errorf("dnsmasq log does not contain expected DHCP sequence: diff (-want +got):\n%s",
diff.LineDiff( diff.LineDiff(
strings.Join(diff.TrimLines(got), "\n"), strings.Join(diff.TrimLines(got), "\n"),
strings.Join(diff.TrimLines(want), "\n"))) strings.Join(diff.TrimLines(want), "\n")))

8
integration/dhcpv6/dhcpv6_test.go
View File

@ -113,8 +113,8 @@ func TestDHCPv6(t *testing.T) {
want := dhcp6.Config{ want := dhcp6.Config{
DNS: []string{"2001:db8::1"}, DNS: []string{"2001:db8::1"},
} }
if diff := cmp.Diff(got, want); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Fatalf("unexpected config: diff (-got +want):\n%s", diff) t.Fatalf("unexpected config: diff (-want +got):\n%s", diff)
} }
c.Release() c.Release()
@ -132,8 +132,8 @@ func TestDHCPv6(t *testing.T) {
withoutMac := func(line string) string { withoutMac := func(line string) string {
return v6AddrRe.ReplaceAllString(strings.TrimSpace(line), "") return v6AddrRe.ReplaceAllString(strings.TrimSpace(line), "")
} }
if diff := cmp.Diff(got, want, cmp.Transformer("WithoutMAC", withoutMac)); diff != "" { if diff := cmp.Diff(want, got, cmp.Transformer("WithoutMAC", withoutMac)); diff != "" {
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 (-want +got):\n%s", diff)
} }
} }
} }

8
integration/netconfig/netconfig_test.go
View File

@ -356,8 +356,8 @@ func TestNetconfig(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if diff := cmp.Diff(routes, wantRoutes); diff != "" { if diff := cmp.Diff(wantRoutes, routes); diff != "" {
t.Fatalf("routes: diff (-got +want):\n%s", diff) t.Fatalf("routes: diff (-want +got):\n%s", diff)
} }
}) })
@ -419,8 +419,8 @@ peer: AVU3LodtnFaFnJmMyNNW7cUk4462lqnVULTFkjWYvRo=
} }
got := strings.Join(rules, "\n") got := strings.Join(rules, "\n")
if diff := cmp.Diff(got, goldenNftablesRules(false), opts...); diff != "" { if diff := cmp.Diff(goldenNftablesRules(false), got, opts...); diff != "" {
t.Fatalf("unexpected nftables rules: diff (-got +want):\n%s", diff) t.Fatalf("unexpected nftables rules: diff (-want +got):\n%s", diff)
} }
}) })

4
integration/radvd/radvd_test.go
View File

@ -117,7 +117,7 @@ Retransmit time : unspecified (0x00000000)
Source link-layer address: 02:73:53:00:CA:FE Source link-layer address: 02:73:53:00:CA:FE
from fe80::73:53ff:fe00:cafe from fe80::73:53ff:fe00:cafe
` `
if diff := cmp.Diff(got, want); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Fatalf("unexpected rdisc6 output: diff (-got +want):\n%s", diff) t.Fatalf("unexpected rdisc6 output: diff (-want +got):\n%s", diff)
} }
} }

4
internal/dhcp4/dhcp4_test.go
View File

@ -67,7 +67,7 @@ func TestDHCP4(t *testing.T) {
"213.144.129.20", "213.144.129.20",
}, },
} }
if diff := cmp.Diff(got, want); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Fatalf("unexpected config: diff (-got +want):\n%s", diff) t.Fatalf("unexpected config: diff (-want +got):\n%s", diff)
} }
} }

4
internal/dhcp4/serialize_test.go
View File

@ -44,7 +44,7 @@ func TestSerialize(t *testing.T) {
if err := json.Unmarshal(b, &got); err != nil { if err := json.Unmarshal(b, &got); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if diff := cmp.Diff(got, want); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Fatalf("unexpected config: diff (-got +want):\n%s", diff) t.Fatalf("unexpected config: diff (-want +got):\n%s", diff)
} }
} }

4
internal/dhcp6/dhcp6_test.go
View File

@ -73,8 +73,8 @@ func TestDHCP6(t *testing.T) {
"2001:1620:2777:2::20", "2001:1620:2777:2::20",
}, },
} }
if diff := cmp.Diff(got, want); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Fatalf("unexpected config: diff (-got +want):\n%s", diff) t.Fatalf("unexpected config: diff (-want +got):\n%s", diff)
} }
} }

4
internal/diag/diag_test.go
View File

@ -48,7 +48,7 @@ func TestDiagMonitor(t *testing.T) {
}, },
}, },
} }
if diff := cmp.Diff(got, want); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Fatalf("Evaluate(): unexpected result: diff (-got +want):\n%s", diff) t.Fatalf("Evaluate(): unexpected result: diff (-want +got):\n%s", diff)
} }
} }

4
internal/testing/dnsmasq/example_test.go
View File

@ -45,7 +45,7 @@ func Example(t *testing.T) {
} }
return result return result
} }
if diff := cmp.Diff(got, want, cmp.Transformer("ActionOnly", actionOnly)); diff != "" { if diff := cmp.Diff(want, got, cmp.Transformer("ActionOnly", actionOnly)); diff != "" {
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 (-want +got):\n%s", diff)
} }
} }