From 5b44ffbb15cafb3b4473de1e065fef1330e20a65 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Wed, 16 Aug 2017 14:08:13 +0200 Subject: [PATCH] do not demand a DO reply to a non-DO query --- regression-tests.recursor-dnssec/test_Interop.py | 12 ++++++------ regression-tests.recursor-dnssec/test_Sortlist.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/regression-tests.recursor-dnssec/test_Interop.py b/regression-tests.recursor-dnssec/test_Interop.py index 4e4c3eb88..3462ee267 100644 --- a/regression-tests.recursor-dnssec/test_Interop.py +++ b/regression-tests.recursor-dnssec/test_Interop.py @@ -40,7 +40,7 @@ forward-zones+=undelegated.insecure.example=%s.12 res = self.sendUDPQuery(query) self.assertRcodeEqual(res, dns.rcode.NOERROR) - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) + self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], []) self.assertRRsetInAnswer(res, expected) def testUndelegatedForwardedZoneExisting(self): @@ -56,7 +56,7 @@ forward-zones+=undelegated.insecure.example=%s.12 res = self.sendUDPQuery(query) self.assertRcodeEqual(res, dns.rcode.SERVFAIL) - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) + self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], []) def testUndelegatedForwardedZoneNXDOMAIN(self): """ @@ -71,7 +71,7 @@ forward-zones+=undelegated.insecure.example=%s.12 res = self.sendUDPQuery(query) self.assertRcodeEqual(res, dns.rcode.SERVFAIL) - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) + self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], []) def testUndelegatedForwardedInsecureZoneExisting(self): """ @@ -87,7 +87,7 @@ forward-zones+=undelegated.insecure.example=%s.12 res = self.sendUDPQuery(query) self.assertRcodeEqual(res, dns.rcode.NOERROR) - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) + self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], []) self.assertRRsetInAnswer(res, expected) def testUndelegatedForwardedInsecureZoneNXDOMAIN(self): @@ -103,7 +103,7 @@ forward-zones+=undelegated.insecure.example=%s.12 res = self.sendUDPQuery(query) self.assertRcodeEqual(res, dns.rcode.NXDOMAIN) - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) + self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], []) def testBothSecureCNAMEAtApex(self): """ @@ -119,7 +119,7 @@ forward-zones+=undelegated.insecure.example=%s.12 self.assertRRsetInAnswer(res, expectedA) self.assertRRsetInAnswer(res, expectedCNAME) self.assertRcodeEqual(res, dns.rcode.NOERROR) - self.assertMessageHasFlags(res, ['QR', 'RD', 'RA', 'AD'], ['DO']) + self.assertMessageHasFlags(res, ['QR', 'RD', 'RA', 'AD'], []) @classmethod def startResponders(cls): diff --git a/regression-tests.recursor-dnssec/test_Sortlist.py b/regression-tests.recursor-dnssec/test_Sortlist.py index 79fbe43fb..7665602bd 100644 --- a/regression-tests.recursor-dnssec/test_Sortlist.py +++ b/regression-tests.recursor-dnssec/test_Sortlist.py @@ -18,7 +18,7 @@ class testSortlist(RecursorTest): res = self.sendUDPQuery(msg, fwparams=dict(one_rr_per_rrset=True)) - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) + self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], []) self.assertRcodeEqual(res, dns.rcode.NOERROR) indexCNAME = -1 -- 2.40.0