From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 19 Feb 2024 10:05:32 +0000 (+0100)
Subject: rec: dnspython's API changed wrt NSID, apply (version dependent) fix in regression... 
X-Git-Tag: auth-5.0.0-alpha0~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ea89984da1c10850dd0cb4e7d4d7ee501e078d;p=thirdparty%2Fpdns.git

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
---

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)