rec: Update the outgoing protobuf tests

We no longer send DS queries to determine the zone cuts before
resolving.

diff --git a/regression-tests.recursor-dnssec/test_Protobuf.py b/regression-tests.recursor-dnssec/test_Protobuf.py
index 4e92e7d60bf7dc577fdfd848fa64815904e99ccb..d22a4d3b300d7252ea5c34d06c28157401a7140f 100644 (file)
--- a/regression-tests.recursor-dnssec/test_Protobuf.py
+++ b/regression-tests.recursor-dnssec/test_Protobuf.py
@@ -370,15 +370,13 @@ class OutgoingProtobufDefaultTest(TestRecursorProtobuf):
     def testA(self):
         name = 'host1.secure.example.'
         expected = list()
-        for qname, qtype, proto, size in [
-                ('example.', dns.rdatatype.DS, dnsmessage_pb2.PBDNSMessage.UDP, 167),
-                (None, None, None, None),  # Query for secure.example.|DS that returns a delegation
-                ('secure.example.', dns.rdatatype.DS, dnsmessage_pb2.PBDNSMessage.UDP, 182),
+        for qname, qtype, proto, responseSize in [
+                ('host1.secure.example.', dns.rdatatype.A, dnsmessage_pb2.PBDNSMessage.UDP, 248),
+                ('.', dns.rdatatype.DNSKEY, dnsmessage_pb2.PBDNSMessage.UDP, 201),
+                ('host1.secure.example.', dns.rdatatype.A, dnsmessage_pb2.PBDNSMessage.UDP, 221),
                 ('example.', dns.rdatatype.DNSKEY, dnsmessage_pb2.PBDNSMessage.UDP, 219),
-                (None, None, None, None),  # Query for host1.secure.example.|DS that returns a delegation
-                (None, None, None, None),  # Query for host1.secure.example.|DS that returns a NXQType
-                ('secure.example.', dns.rdatatype.DNSKEY, dnsmessage_pb2.PBDNSMessage.UDP, 233),
                 ('host1.secure.example.', dns.rdatatype.A, dnsmessage_pb2.PBDNSMessage.UDP, 175),
+                ('secure.example.', dns.rdatatype.DNSKEY, dnsmessage_pb2.PBDNSMessage.UDP, 233),
         ]:
             if not qname:
                 expected.append((None, None, None, None, None, None))
@@ -386,7 +384,7 @@ class OutgoingProtobufDefaultTest(TestRecursorProtobuf):
             query = dns.message.make_query(qname, qtype, use_edns=True, want_dnssec=True)
             resp = dns.message.make_response(query)
             expected.append((
-                qname, qtype, query, resp, proto, size
+                qname, qtype, query, resp, proto, responseSize
             ))
 
         # expected = dns.rrset.from_text(name, 0, dns.rdataclass.IN, 'A', '192.0.2.42')
@@ -394,7 +392,7 @@ class OutgoingProtobufDefaultTest(TestRecursorProtobuf):
         query.flags |= dns.flags.RD
         res = self.sendUDPQuery(query)
 
-        for qname, qtype, qry, ans, proto, size in expected:
+        for qname, qtype, qry, ans, proto, responseSize in expected:
             if not qname:
                 self.getFirstProtobufMessage()
                 self.getFirstProtobufMessage()
@@ -405,7 +403,7 @@ class OutgoingProtobufDefaultTest(TestRecursorProtobuf):
 
             # Check the answer
             msg = self.getFirstProtobufMessage()
-            self.checkProtobufIncomingResponse(msg, proto, ans, length=size)
+            self.checkProtobufIncomingResponse(msg, proto, ans, length=responseSize)
 
         self.checkNoRemainingMessage()
 
@@ -429,14 +427,12 @@ class OutgoingProtobufNoQueriesTest(TestRecursorProtobuf):
         name = 'host1.secure.example.'
         expected = list()
         for qname, qtype, proto, size in [
-                ('example.', dns.rdatatype.DS, dnsmessage_pb2.PBDNSMessage.UDP, 167),
-                (None, None, None, None),  # Query for secure.example.|DS that returns a delegation
-                ('secure.example.', dns.rdatatype.DS, dnsmessage_pb2.PBDNSMessage.UDP, 182),
+                ('host1.secure.example.', dns.rdatatype.A, dnsmessage_pb2.PBDNSMessage.UDP, 248),
+                ('.', dns.rdatatype.DNSKEY, dnsmessage_pb2.PBDNSMessage.UDP, 201),
+                ('host1.secure.example.', dns.rdatatype.A, dnsmessage_pb2.PBDNSMessage.UDP, 221),
                 ('example.', dns.rdatatype.DNSKEY, dnsmessage_pb2.PBDNSMessage.UDP, 219),
-                (None, None, None, None),  # Query for host1.secure.example.|DS that returns a delegation
-                (None, None, None, None),  # Query for host1.secure.example.|DS that returns a NXQType
-                ('secure.example.', dns.rdatatype.DNSKEY, dnsmessage_pb2.PBDNSMessage.UDP, 233),
                 ('host1.secure.example.', dns.rdatatype.A, dnsmessage_pb2.PBDNSMessage.UDP, 175),
+                ('secure.example.', dns.rdatatype.DNSKEY, dnsmessage_pb2.PBDNSMessage.UDP, 233),
         ]:
             if not qname:
                 expected.append((None, None, None, None, None, None))