From 248b689fda0e7e7091bbce37d891af4cef6f9f1e Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Tue, 12 Jul 2016 12:01:12 +0200 Subject: [PATCH] Update regression tests for +DO means +AD --- regression-tests.recursor-dnssec/test_Flags.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/regression-tests.recursor-dnssec/test_Flags.py b/regression-tests.recursor-dnssec/test_Flags.py index 9225ff602f..22b63c89d8 100644 --- a/regression-tests.recursor-dnssec/test_Flags.py +++ b/regression-tests.recursor-dnssec/test_Flags.py @@ -1,6 +1,5 @@ import os import socket -#import unittest import dns from recursortests import RecursorTest @@ -241,7 +240,7 @@ class TestFlags(RecursorTest): expected = dns.rrset.from_text('ns1.example.', 0, dns.rdataclass.IN, 'A', '{prefix}.10'.format(prefix=self._PREFIX)) res = self.sendUDPQuery(msg, 'process') - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) + self.assertMessageHasFlags(res, ['AD', 'QR', 'RA', 'RD'], ['DO']) self.assertMatchingRRSIGInAnswer(res, expected) def testValidate_Secure_DO(self): @@ -249,7 +248,7 @@ class TestFlags(RecursorTest): expected = dns.rrset.from_text('ns1.example.', 0, dns.rdataclass.IN, 'A', '{prefix}.10'.format(prefix=self._PREFIX)) res = self.sendUDPQuery(msg, 'validate') - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) + self.assertMessageHasFlags(res, ['AD', 'QR', 'RA', 'RD'], ['DO']) self.assertMatchingRRSIGInAnswer(res, expected) ## @@ -275,7 +274,7 @@ class TestFlags(RecursorTest): expected = dns.rrset.from_text('ns1.example.', 0, dns.rdataclass.IN, 'A', '{prefix}.10'.format(prefix=self._PREFIX)) res = self.sendUDPQuery(msg, 'process') - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD', 'CD'], ['DO']) + self.assertMessageHasFlags(res, ['AD', 'QR', 'RA', 'RD', 'CD'], ['DO']) self.assertMatchingRRSIGInAnswer(res, expected) def testValidate_Secure_DOCD(self): @@ -283,7 +282,7 @@ class TestFlags(RecursorTest): expected = dns.rrset.from_text('ns1.example.', 0, dns.rdataclass.IN, 'A', '{prefix}.10'.format(prefix=self._PREFIX)) res = self.sendUDPQuery(msg, 'validate') - self.assertMessageHasFlags(res, ['QR', 'RA', 'RD', 'CD'], ['DO']) + self.assertMessageHasFlags(res, ['AD', 'QR', 'RA', 'RD', 'CD'], ['DO']) self.assertMatchingRRSIGInAnswer(res, expected) ## @@ -482,9 +481,9 @@ class TestFlags(RecursorTest): expected = dns.rrset.from_text('ted.bogus.example.', 0, dns.rdataclass.IN, 'A', '192.0.2.1') res = self.sendUDPQuery(msg, 'process') - self.assertRcodeEqual(res, dns.rcode.NOERROR) self.assertMessageHasFlags(res, ['QR', 'RA', 'RD'], ['DO']) - self.assertMatchingRRSIGInAnswer(res, expected) + self.assertRcodeEqual(res, dns.rcode.SERVFAIL) + self.assertAnswerEmpty(res) def testValidate_Bogus_DO(self): msg = self.getQueryForBogus('', 'DO') -- 2.47.3