Revert to including path in chroot error message

Author: mhsmith

Lib/test/test_os/test_os.py

@@ -4570,10 +4570,7 @@ def test_oserror_filename(self):
                 try:
                     func(name, *func_args)
                 except OSError as err:
-                    if support.is_android and os.getuid() != 0 and func is getattr(os, 'chroot', None):
-                        self.assertIsNone(err.filename, str(func))
-                    else:
-                        self.assertIs(err.filename, name, str(func))
+                    self.assertIs(err.filename, name, str(func))
                 except UnicodeDecodeError:
                     pass
                 else:

Lib/test/test_os/test_posix.py

@@ -107,6 +107,7 @@ def test_getresgid(self):
     @unittest.skipUnless(hasattr(posix, 'setresuid'),
                          'test needs posix.setresuid()')
     def test_setresuid(self):
+        # Android blocks this function for non-root users regardless of the arguments.
         if support.is_android and os.getuid() != 0:
             self.assertRaises(PermissionError, posix.setresuid, -1, -1, -1)
             return
@@ -127,6 +128,7 @@ def test_setresuid_exception(self):
     @unittest.skipUnless(hasattr(posix, 'setresgid'),
                          'test needs posix.setresgid()')
     def test_setresgid(self):
+        # Android blocks this function for non-root users regardless of the arguments.
         if support.is_android and os.getuid() != 0:
             self.assertRaises(PermissionError, posix.setresgid, -1, -1, -1)
             return

Modules/posixmodule.c

@@ -4418,7 +4418,7 @@ os_chroot_impl(PyObject *module, path_t *path)
     // rather than returning a permission error.
     if (getuid() != 0) {
         errno = EPERM;
-        return posix_error();
+        return path_error(path);
     }
 #endif
     int res;