Teask: more auth threads and prime the delay.example NS

diff --git a/regression-tests.recursor-dnssec/recursortests.py b/regression-tests.recursor-dnssec/recursortests.py
index ec611965f3e8eefc2ad0195367a86201bf142e5e..eceecdee4dca7762ee783d55d5e84e2862fab16b 100644 (file)
--- a/regression-tests.recursor-dnssec/recursortests.py
+++ b/regression-tests.recursor-dnssec/recursortests.py
@@ -323,7 +323,7 @@ PrivateKey: Ep9uo6+wwjb4MaOmqq7LHav2FLrjotVOeZg8JT1Qk04=
         '15': {'threads': 1,
                'zones': ['insecure.optout.example', 'secure.optout.example', 'cname-secure.example']},
         # This zone need more threads so that the lua delay code does not cause serialization
-        '16': {'threads': 2,
+        '16': {'threads': 4,
                'zones': ['delay.example']}
     }
 

diff --git a/regression-tests.recursor-dnssec/test_OOOTCP.py b/regression-tests.recursor-dnssec/test_OOOTCP.py
index bf9471d1733a9706969d0704a57f6c9bc809d947..675f471a4087674dfa277183dc39a46991b40031 100644 (file)
--- a/regression-tests.recursor-dnssec/test_OOOTCP.py
+++ b/regression-tests.recursor-dnssec/test_OOOTCP.py
@@ -13,7 +13,12 @@ class testOOOTCP(RecursorTest):
     def generateRecursorConfig(cls, confdir):
         super(testOOOTCP, cls).generateRecursorConfig(confdir)
 
+    def primeNS(self):
+        query = dns.message.make_query('delay.example.', 'NS', want_dnssec=False)
+        self.sendUDPQuery(query)
+        
     def testOOOVeryBasic(self):
+        self.primeNS()
         expected = {}
         queries = []
         for zone in ['5.delay.example.', '0.delay.example.']:
@@ -38,6 +43,7 @@ class testOOOTCP(RecursorTest):
             i = i + 1
 
     def testOOOTimeout(self):
+        self.primeNS()
         expected = {}
         queries = []
         for zone in ['25.delay.example.', '1.delay.example.']:
@@ -46,6 +52,7 @@ class testOOOTCP(RecursorTest):
             queries.append(query)
 
         ress = self.sendTCPQueries(queries)
+        
         self.assertEqual(len(ress), 2)
         exp = dns.rrset.from_text(zone, 0, dns.rdataclass.IN, 'TXT', 'a')
         self.assertRRsetInAnswer(ress[0], exp)