Merge pull request #13062 from Habbie/auth-loglevel-prefix

[thirdparty/pdns.git] / regression-tests.recursor-dnssec / test_OOOTCP.py

diff --git a/regression-tests.recursor-dnssec/test_OOOTCP.py b/regression-tests.recursor-dnssec/test_OOOTCP.py
index a68d208e7e50375b5154c95894c868e4ea2aa554..9c18017011a0475182288e56e5ae7cc060ba255c 100644 (file)
--- a/regression-tests.recursor-dnssec/test_OOOTCP.py
+++ b/regression-tests.recursor-dnssec/test_OOOTCP.py
@@ -6,7 +6,7 @@ from recursortests import RecursorTest
 class testOOOTCP(RecursorTest):
     _confdir = 'OOOTCP'
 
-    _config_template = """dnssec=off
+    _config_template = """dnssec=validate
 """
 
     @classmethod
@@ -18,7 +18,7 @@ class testOOOTCP(RecursorTest):
         queries = []
         for zone in ['5.delay1.example.', '0.delay2.example.']:
             expected[zone] = dns.rrset.from_text(zone, 0, dns.rdataclass.IN, 'TXT', 'a')
-            query = dns.message.make_query(zone, 'TXT', want_dnssec=False)
+            query = dns.message.make_query(zone, 'TXT', want_dnssec=True)
             query.flags |= dns.flags.AD
             queries.append(query)
 
@@ -32,16 +32,16 @@ class testOOOTCP(RecursorTest):
             print(ress[i].answer[0].to_text())
             print('exp')
             print(exp.to_text())
-            #self.assertMessageIsAuthenticated(ress[i])
+            self.assertMessageIsAuthenticated(ress[i])
             self.assertRRsetInAnswer(ress[i], exp)
-            #self.assertMatchingRRSIGInAnswer(ress[i], exp)
+            self.assertMatchingRRSIGInAnswer(ress[i], exp)
             i = i + 1
 
-    def XXXOOOTimeout(self):
+    def testOOOTimeout(self):
         expected = {}
         queries = []
         for zone in ['25.delay1.example.', '1.delay2.example.']:
-            query = dns.message.make_query(zone, 'TXT', want_dnssec=False)
+            query = dns.message.make_query(zone, 'TXT', want_dnssec=True)
             query.flags |= dns.flags.AD
             queries.append(query)
 
@@ -50,8 +50,10 @@ class testOOOTCP(RecursorTest):
         self.assertEqual(len(ress), 2)
         exp = dns.rrset.from_text('1.delay2.example.', 0, dns.rdataclass.IN, 'TXT', 'a')
         self.assertRRsetInAnswer(ress[0], exp)
+        self.assertMatchingRRSIGInAnswer(ress[0], exp)
         self.assertRcodeEqual(ress[1], dns.rcode.SERVFAIL)
 
         # Let the auth timeout happen to not disturb other tests
+        # this can happen if the auth is single-threaded
         time.sleep(1)