Merge pull request #15352 from omoerbeek/rec-simpedottest

rec: in test_SimpleDot.py make sure we have the root DNSKEY in cache, it might require TCP

Author: omoerbeek

regression-tests.recursor-dnssec/test_SimpleDoT.py

@@ -20,6 +20,25 @@ class SimpleDoTTest(RecursorTest):
 
     @pytest.mark.external
     def testTXT(self):
+        query = dns.message.make_query('.', 'DNSKEY', want_dnssec=True)
+        query.flags |= dns.flags.AD
+
+        # As this test uses external servers, be more generous wrt timeouts than the default 2.0s
+        res = self.sendUDPQuery(query, timeout=5.0)
+
+        self.assertMessageIsAuthenticated(res)
+        self.assertRcodeEqual(res, 0);
+        rec_controlCmd = [os.environ['RECCONTROL'],
+                          '--config-dir=%s' % 'configs/' + self._confdir,
+                          'get tcp-outqueries']
+        try:
+            ret = subprocess.check_output(rec_controlCmd, stderr=subprocess.STDOUT)
+            tcpcount = ret
+
+        except subprocess.CalledProcessError as e:
+            print(e.output)
+            raise
+
         expected = dns.rrset.from_text('dot-test-target.powerdns.org.', 0, dns.rdataclass.IN, 'TXT', 'https://github.com/PowerDNS/pdns/pull/12825')
         query = dns.message.make_query('dot-test-target.powerdns.org', 'TXT', want_dnssec=True)
         query.flags |= dns.flags.AD
@@ -48,7 +67,7 @@ def testTXT(self):
                           'get tcp-outqueries']
         try:
             ret = subprocess.check_output(rec_controlCmd, stderr=subprocess.STDOUT)
-            self.assertEqual(ret, b'0\n')
+            self.assertEqual(ret, tcpcount)
 
         except subprocess.CalledProcessError as e:
             print(e.output)