diff options
| author | Steffen Allner <sa@gocept.com> | 2022-04-14 08:47:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-14 08:47:41 +0200 |
| commit | 2b33bec1afe96b67cf3fb87ad65ede5826056459 (patch) | |
| tree | b046c9bad2e99db590927a8185dbdb24f582f834 | |
| parent | f3533a1ffa45414037aff07c998e29be8a4c8be8 (diff) | |
| parent | 4e058ea94ac23a5cc1987fdf7bf49a657464416c (diff) | |
| download | zope-security-2b33bec1afe96b67cf3fb87ad65ede5826056459.tar.gz | |
Merge pull request #84 from zopefoundation/re-83-make-suites-new
re #83: Remove `unittest.makeSuite` as it is deprecated in Python 3.11+.
| -rw-r--r-- | CHANGES.rst | 4 | ||||
| -rw-r--r-- | src/zope/security/tests/test_protectclass.py | 6 | ||||
| -rw-r--r-- | src/zope/security/tests/test_simpleinteraction.py | 2 | ||||
| -rw-r--r-- | src/zope/security/tests/test_zcml.py | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 5a7e37a..884b2b5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,10 @@ ``ForbiddenAttribute`` on Python 3. See `issue 75 <https://github.com/zopefoundation/zope.security/issues/75>`_. +- Remove usage of ``unittest.makeSuite`` as it is deprecated in Python 3.11+. + See `issue 83 + <https://github.com/zopefoundation/zope.security/issues/83>`_. + 5.2 (2022-03-10) ================ diff --git a/src/zope/security/tests/test_protectclass.py b/src/zope/security/tests/test_protectclass.py index 2f8e490..16999e5 100644 --- a/src/zope/security/tests/test_protectclass.py +++ b/src/zope/security/tests/test_protectclass.py @@ -141,7 +141,7 @@ class Bar(Foo): def test_suite(): return unittest.TestSuite(( - unittest.makeSuite(Test_protectName), - unittest.makeSuite(Test_protectSetAttribute), - unittest.makeSuite(Test_protectLikeUnto), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_protectName), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_protectSetAttribute), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_protectLikeUnto), )) diff --git a/src/zope/security/tests/test_simpleinteraction.py b/src/zope/security/tests/test_simpleinteraction.py index d5031e4..3135027 100644 --- a/src/zope/security/tests/test_simpleinteraction.py +++ b/src/zope/security/tests/test_simpleinteraction.py @@ -76,5 +76,5 @@ class TestInteraction(unittest.TestCase): def test_suite(): return unittest.TestSuite(( - unittest.makeSuite(TestInteraction), + unittest.defaultTestLoader.loadTestsFromTestCase(TestInteraction), )) diff --git a/src/zope/security/tests/test_zcml.py b/src/zope/security/tests/test_zcml.py index 2cdf62a..0cf9616 100644 --- a/src/zope/security/tests/test_zcml.py +++ b/src/zope/security/tests/test_zcml.py @@ -193,8 +193,8 @@ class DummyZCMLContext(object): def test_suite(): return unittest.TestSuite(( - unittest.makeSuite(PermissionTests), - unittest.makeSuite(Test_securityPolicy), - unittest.makeSuite(Test_permission), - unittest.makeSuite(Test_redefinePermission), + unittest.defaultTestLoader.loadTestsFromTestCase(PermissionTests), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_securityPolicy), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_permission), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_redefinePermission), )) |