From: Otto Moerbeek Date: Mon, 26 Feb 2024 12:04:08 +0000 (+0100) Subject: 4.9.x uses unittest instead of pytest X-Git-Tag: rec-4.9.4~4^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdaad3ac089e643347927389c304a30bcc690b0c;p=thirdparty%2Fpdns.git 4.9.x uses unittest instead of pytest --- diff --git a/regression-tests.recursor-dnssec/test_ExtendedErrors.py b/regression-tests.recursor-dnssec/test_ExtendedErrors.py index d2625137f3..d9198b599b 100644 --- a/regression-tests.recursor-dnssec/test_ExtendedErrors.py +++ b/regression-tests.recursor-dnssec/test_ExtendedErrors.py @@ -1,7 +1,7 @@ import dns import os import extendederrors -import pytest +import unittest from recursortests import RecursorTest @@ -83,7 +83,7 @@ extended-resolution-errors=yes super(ExtendedErrorsRecursorTest, cls).generateRecursorConfig(confdir) - @pytest.mark.skip(reason="sidnlabs no longer serves thiss until further notice") + @unittest.skip(reason="sidnlabs no longer serves thiss until further notice") def testNotIncepted(self): qname = 'signotincepted.bad-dnssec.wb.sidnlabs.nl.' query = dns.message.make_query(qname, 'A', want_dnssec=True) @@ -97,7 +97,7 @@ extended-resolution-errors=yes self.assertEqual(res.options[0].otype, 15) self.assertEqual(res.options[0], extendederrors.ExtendedErrorOption(8, b'')) - @pytest.mark.skip(reason="sidnlabs no longer serves thiss until further notice") + @unittest.skip(reason="sidnlabs no longer serves thiss until further notice") def testExpired(self): qname = 'sigexpired.bad-dnssec.wb.sidnlabs.nl.' query = dns.message.make_query(qname, 'A', want_dnssec=True) @@ -124,7 +124,7 @@ extended-resolution-errors=yes self.assertEqual(res.options[0].otype, 15) self.assertEqual(res.options[0], extendederrors.ExtendedErrorOption(6, b'')) - @pytest.mark.skip(reason="sidnlabs no longer serves thiss until further notice") + @unittest.skip(reason="sidnlabs no longer serves thiss until further notice") def testBogus(self): qname = 'bogussig.ok.bad-dnssec.wb.sidnlabs.nl.' query = dns.message.make_query(qname, 'A', want_dnssec=True) @@ -239,7 +239,7 @@ extended-resolution-errors=no def generateRecursorConfig(cls, confdir): super(NoExtendedErrorsRecursorTest, cls).generateRecursorConfig(confdir) - @pytest.mark.skip(reason="sidnlabs no longer serves thiss until further notice") + @unittest.skip(reason="sidnlabs no longer serves thiss until further notice") def testNotIncepted(self): qname = 'signotincepted.bad-dnssec.wb.sidnlabs.nl.' query = dns.message.make_query(qname, 'A', want_dnssec=True)