From e1ea89984da1c10850dd0cb4e7d4d7ee501e078d Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Mon, 19 Feb 2024 11:05:32 +0100 Subject: [PATCH] rec: dnspython's API changed wrt NSID, apply (version dependent) fix in regression test See https://dnspython.readthedocs.io/en/stable/whatsnew.html 2.6.0 2nd bullet --- regression-tests.recursor-dnssec/test_ServerNames.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/regression-tests.recursor-dnssec/test_ServerNames.py b/regression-tests.recursor-dnssec/test_ServerNames.py index e130a3d0dd..79dfd0060e 100644 --- a/regression-tests.recursor-dnssec/test_ServerNames.py +++ b/regression-tests.recursor-dnssec/test_ServerNames.py @@ -108,7 +108,10 @@ version-string=%s response = self.sendUDPQuery(query) self.assertEqual(len(response.options), 1) - self.assertEqual(response.options[0].data, self._servername.encode('ascii')) + if dns.version.MAJOR < 2 or (dns.version.MAJOR == 2 and dns.version.MINOR < 6): + self.assertEqual(response.options[0].data, self._servername.encode('ascii')) + else: + self.assertEqual(response.options[0].to_text(), 'NSID ' + self._servername) def testNSIDTCP(self): """ @@ -119,4 +122,7 @@ version-string=%s response = self.sendTCPQuery(query) self.assertEqual(len(response.options), 1) - self.assertEqual(response.options[0].data, self._servername.encode('ascii')) + if dns.version.MAJOR < 2 or (dns.version.MAJOR == 2 and dns.version.MINOR < 6): + self.assertEqual(response.options[0].data, self._servername.encode('ascii')) + else: + self.assertEqual(response.options[0].to_text(), 'NSID ' + self._servername) -- 2.47.2