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

dns_test: xps → testtarget

Browse Source 
This fixes running the tests on xps, where the entry derived from os.Hostname
would clash with the xps entries the testcase tries to install.
This commit is contained in:
Michael Stapelberg 2018-11-22 17:03:51 +01:00
parent df9a40557c
commit ac883da6a5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/dns/dns_test.go
View File

@ -72,14 +72,14 @@ func TestDHCP(t *testing.T) {
s := NewServer("localhost:0", "lan") s := NewServer("localhost:0", "lan")
s.SetLeases([]dhcp4d.Lease{ s.SetLeases([]dhcp4d.Lease{
{ {
Hostname: "xps", Hostname: "testtarget",
Addr: net.IP{192, 168, 42, 23}, Addr: net.IP{192, 168, 42, 23},
}, },
}) })
resolveXps := func(t *testing.T) { resolveTestTarget := func(t *testing.T) {
m := new(dns.Msg) m := new(dns.Msg)
m.SetQuestion("xps.lan.", dns.TypeA) m.SetQuestion("testtarget.lan.", dns.TypeA)
s.Mux.ServeDNS(r, m) s.Mux.ServeDNS(r, m)
if got, want := len(r.response.Answer), 1; got != want { if got, want := len(r.response.Answer), 1; got != want {
t.Fatalf("unexpected number of answers: got %d, want %d", got, want) t.Fatalf("unexpected number of answers: got %d, want %d", got, want)
@ -92,23 +92,23 @@ func TestDHCP(t *testing.T) {
t.Fatalf("unexpected response IP: got %v, want %v", got, want) t.Fatalf("unexpected response IP: got %v, want %v", got, want)
} }
} }
t.Run("xps.lan.", resolveXps) t.Run("testtarget.lan.", resolveTestTarget)
expired := time.Now().Add(-1 * time.Second) expired := time.Now().Add(-1 * time.Second)
s.SetLeases([]dhcp4d.Lease{ s.SetLeases([]dhcp4d.Lease{
{ {
Hostname: "xps", Hostname: "testtarget",
Addr: net.IP{192, 168, 42, 23}, Addr: net.IP{192, 168, 42, 23},
Expiry: time.Now().Add(1 * time.Minute), Expiry: time.Now().Add(1 * time.Minute),
}, },
{ {
Hostname: "xps", Hostname: "testtarget",
Addr: net.IP{192, 168, 42, 150}, Addr: net.IP{192, 168, 42, 150},
Expiry: expired, Expiry: expired,
}, },
}) })
t.Run("xps.lan. (expired)", resolveXps) t.Run("testtarget.lan. (expired)", resolveTestTarget)
t.Run("notfound.lan.", func(t *testing.T) { t.Run("notfound.lan.", func(t *testing.T) {
m := new(dns.Msg) m := new(dns.Msg)
@ -293,7 +293,7 @@ func TestDHCPReverse(t *testing.T) {
s := NewServer("localhost:0", "lan") s := NewServer("localhost:0", "lan")
s.SetLeases([]dhcp4d.Lease{ s.SetLeases([]dhcp4d.Lease{
{ {
Hostname: "xps", Hostname: "testtarget",
Addr: test.ip, Addr: test.ip,
}, },
}) })
@ -307,7 +307,7 @@ func TestDHCPReverse(t *testing.T) {
if _, ok := a.(*dns.PTR); !ok { if _, ok := a.(*dns.PTR); !ok {
t.Fatalf("unexpected response type: got %T, want dns.PTR", a) t.Fatalf("unexpected response type: got %T, want dns.PTR", a)
} }
if got, want := a.(*dns.PTR).Ptr, "xps.lan."; got != want { if got, want := a.(*dns.PTR).Ptr, "testtarget.lan."; got != want {
t.Fatalf("unexpected response record: got %q, want %q", got, want) t.Fatalf("unexpected response record: got %q, want %q", got, want)
} }
}) })