Revert "Resolve unqualified names in the local WeaveDNS domain"

This commit is contained in:
Matthias Radestock committed 2015-07-14 16:06:05 +01:00
1 parent 39a1f2163f
commit 18032015b9
9 files changed
+43 -152

No files matched your search

+5 -11
View File
@@ -32,12 +32,11 @@ func TestUDPDNSServer(t *testing.T) {
setupForTest(t)
const (
successTestName = "test1.weave.local."
successTestNameShort = "test1."
failTestName = "fail.weave.local."
nonLocalName = "weave.works."
testAddr1 = "10.2.2.1"
containerID = "somecontainer"
successTestName = "test1.weave.local."
failTestName = "fail.weave.local."
nonLocalName = "weave.works."
testAddr1 = "10.2.2.1"
containerID = "somecontainer"
)
testCIDR1 := testAddr1 + "/24"
@@ -106,11 +105,6 @@ func TestUDPDNSServer(t *testing.T) {
require.IsType(t, (*dns.A)(nil), r.Answer[0], "DNS record")
require.Equal(t, testAddr1, r.Answer[0].(*dns.A).A.String(), "IP address")
// Assert that we can get the same result when asking for the same name but with no domain
_, r = assertExchange(t, successTestNameShort, dns.TypeA, testPort, 1, 1, 0)
require.IsType(t, (*dns.A)(nil), r.Answer[0], "DNS record")
require.Equal(t, testAddr1, r.Answer[0].(*dns.A).A.String(), "IP address")
assertExchange(t, failTestName, dns.TypeA, testPort, 0, 0, dns.RcodeNameError)
_, r = assertExchange(t, testRDNSsuccess, dns.TypePTR, testPort, 1, 1, 0)