Add tests for NS records

dns/test.example.org.json

@@ -3,6 +3,12 @@
         "bad-example-there-really-should-be-an-ns-record-at-the-apex-here": {},
         "bar": {
             "a": [ [ "192.168.1.2" ] ]
+        },
+        "sub-alias": {
+        	"alias": "sub"
+        },
+        "sub": {
+        	"ns": [ "ns1.example.com", "ns2.example.com" ]
         }
     }
 }

serve_test.go

@@ -97,6 +97,11 @@ func (s *ServeSuite) TestServingAliases(c *C) {
 	if len(r.Answer) > 0 {
 		c.Check(r.Answer[0].(*dns.CNAME).Target, Equals, "geo-europe.bitnames.com.")
 	}
+
+	// Alias to Ns records
+	r = exchange(c, "sub-alias.test.example.org.", dns.TypeNS)
+	c.Check(r.Answer[0].(*dns.NS).Ns, Equals, "ns1.example.com.")
+
 }
 
 func (s *ServeSuite) TestServingEDNS(c *C) {

zone.go

@@ -119,6 +119,10 @@ func (z *Zone) SoaRR() dns.RR {
 	return z.Labels[""].firstRR(dns.TypeSOA)
 }
 
+// Find label "s" in country "cc" falling back to the appropriate
+// continent and the global label name as needed. Looks for the
+// first available qType at each targeting level. Return a Label
+// and the qtype that was "found"
 func (z *Zone) findLabels(s, cc string, qts qTypes) (*Label, uint16) {
 
 	selectors := []string{}

zone_test.go

@@ -5,7 +5,7 @@ import (
 	. "launchpad.net/gocheck"
 )
 
-func (s *ConfigSuite) TestZone(c *C) {
+func (s *ConfigSuite) TestExampleComZone(c *C) {
 	ex := s.zones["test.example.com"]
 
 	// test.example.com was loaded
@@ -38,4 +38,27 @@ func (s *ConfigSuite) TestZone(c *C) {
 	label, qtype = ex.findLabels("www", "", qTypes{dns.TypeCNAME, dns.TypeA})
 	c.Check(label.Records[dns.TypeCNAME], HasLen, 1)
 	c.Check(qtype, Equals, dns.TypeCNAME)
+
+	label, qtype = ex.findLabels("", "", qTypes{dns.TypeNS})
+	Ns := label.Records[dns.TypeNS]
+	c.Check(Ns, HasLen, 2)
+	c.Check(Ns[0].RR.(*dns.NS).Ns, Equals, "ns1.example.net.")
+	c.Check(Ns[1].RR.(*dns.NS).Ns, Equals, "ns2.example.net.")
+
+}
+
+func (s *ConfigSuite) TestExampleOrgZone(c *C) {
+	ex := s.zones["test.example.org"]
+
+	// test.example.org was loaded
+	c.Assert(ex.Labels, NotNil)
+
+	label, qtype := ex.findLabels("sub", "", qTypes{dns.TypeNS})
+	c.Assert(qtype, Equals, dns.TypeNS)
+
+	Ns := label.Records[dns.TypeNS]
+	c.Check(Ns, HasLen, 2)
+	c.Check(Ns[0].RR.(*dns.NS).Ns, Equals, "ns1.example.com.")
+	c.Check(Ns[1].RR.(*dns.NS).Ns, Equals, "ns2.example.com.")
+
 }