remove the new decorators to better names

Author: kulikjak

Lib/test/support/__init__.py

@@ -71,7 +71,8 @@
     "BrokenIter",
     "in_systemd_nspawn_sync_suppressed",
     "run_no_yield_async_fn", "run_yielding_async_fn", "async_yield",
-    "reset_code", "on_github_actions", "requires_root", "requires_non_root",
+    "reset_code", "on_github_actions",
+    "requires_root_user", "requires_non_root_user",
     ]
 
 
@@ -3320,5 +3321,5 @@ def control_characters_c0() -> list[str]:
 
 
 _ROOT_IN_POSIX = hasattr(os, 'geteuid') and os.geteuid() == 0
-requires_root = unittest.skipUnless(_ROOT_IN_POSIX, "test needs root privilege")
-requires_non_root = unittest.skipIf(_ROOT_IN_POSIX, "test needs non-root account")
+requires_root_user = unittest.skipUnless(_ROOT_IN_POSIX, "test needs root privilege")
+requires_non_root_user = unittest.skipIf(_ROOT_IN_POSIX, "test needs non-root account")

Lib/test/test_mailbox.py

@@ -11,7 +11,7 @@
 from test.support import import_helper, warnings_helper
 from test.support import os_helper
 from test.support import refleak_helper
-from test.support import requires_root
+from test.support import requires_root_user
 from test.support import socket_helper
 import unittest
 import textwrap
@@ -1087,7 +1087,7 @@ def test_permissions_after_flush(self):
 
         self.assertEqual(os.stat(self._path).st_mode, mode)
 
-    @requires_root
+    @requires_root_user
     @unittest.skipUnless(hasattr(os, 'chown'), 'requires os.chown')
     def test_ownership_after_flush(self):
         # See issue gh-117467

Lib/test/test_os/test_os.py

@@ -33,8 +33,8 @@
 from test.support import os_helper
 from test.support import socket_helper
 from test.support import infinite_recursion
-from test.support import requires_root
-from test.support import requires_non_root
+from test.support import requires_root_user
+from test.support import requires_non_root_user
 from test.support import warnings_helper
 from platform import win32_is_iot
 from .utils import create_file
@@ -2255,7 +2255,7 @@ def test_chown_gid(self):
         gid = os.stat(os_helper.TESTFN).st_gid
         self.assertEqual(gid, gid_2)
 
-    @requires_root
+    @requires_root_user
     @unittest.skipUnless(len(all_users) > 1, "test needs more than one user")
     def test_chown_with_root(self):
         uid_1, uid_2 = all_users[:2]
@@ -2267,7 +2267,7 @@ def test_chown_with_root(self):
         uid = os.stat(os_helper.TESTFN).st_uid
         self.assertEqual(uid, uid_2)
 
-    @requires_non_root
+    @requires_non_root_user
     @unittest.skipUnless(len(all_users) > 1, "test needs and more than one user")
     def test_chown_without_permission(self):
         uid_1, uid_2 = all_users[:2]

Lib/test/test_pathlib/test_pathlib.py

@@ -20,7 +20,7 @@
 from test.support import is_emscripten, is_wasi, is_wasm32
 from test.support import infinite_recursion
 from test.support import os_helper
-from test.support import requires_root
+from test.support import requires_root_user
 from test.support.os_helper import TESTFN, FS_NONASCII, FakePath
 try:
     import fcntl
@@ -1550,7 +1550,7 @@ def raiser(*args, **kwargs):
             self.assertRaises(FileNotFoundError, source.copy, target)
 
     @unittest.skipIf(sys.platform == "win32" or sys.platform == "wasi", "directories are always readable on Windows and WASI")
-    @requires_root
+    @requires_root_user
     def test_copy_dir_no_read_permission(self):
         base = self.cls(self.base)
         source = base / 'dirE'
@@ -2023,7 +2023,7 @@ def test_owner(self):
         self.assertEqual(expected_name, p.owner())
 
     @unittest.skipUnless(pwd, "the pwd module is needed for this test")
-    @requires_root
+    @requires_root_user
     def test_owner_no_follow_symlinks(self):
         all_users = [u.pw_uid for u in pwd.getpwall()]
         if len(all_users) < 2:
@@ -2058,7 +2058,7 @@ def test_group(self):
         self.assertEqual(expected_name, p.group())
 
     @unittest.skipUnless(grp, "the grp module is needed for this test")
-    @requires_root
+    @requires_root_user
     def test_group_no_follow_symlinks(self):
         all_groups = [g.gr_gid for g in grp.getgrall()]
         if len(all_groups) < 2: