[Python-checkins] [3.6] bpo-28759: Skip some tests on PermissionError raised by Android (GH-4350) (#4380)
xdegaye
webhook-mailer at python.org
Sun Nov 12 12:18:39 EST 2017
https://github.com/python/cpython/commit/ad004f9b5a581f577374c56d8ab27e9ef2e73452
commit: ad004f9b5a581f577374c56d8ab27e9ef2e73452
branch: 3.6
author: xdegaye <xdegaye at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-11-12T18:18:36+01:00
summary:
[3.6] bpo-28759: Skip some tests on PermissionError raised by Android (GH-4350) (#4380)
(cherry picked from commit 92c2ca7633c881a56157f2fb8b2e1b8c7114e5fb)
files:
M Lib/test/eintrdata/eintr_tester.py
M Lib/test/support/__init__.py
M Lib/test/test_genericpath.py
M Lib/test/test_pathlib.py
M Lib/test/test_posix.py
M Lib/test/test_shutil.py
M Lib/test/test_stat.py
diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py
index 1dbe88efe70..bc308fe107b 100644
--- a/Lib/test/eintrdata/eintr_tester.py
+++ b/Lib/test/eintrdata/eintr_tester.py
@@ -20,7 +20,6 @@
import unittest
from test import support
-android_not_root = support.android_not_root
@contextlib.contextmanager
def kill_on_error(proc):
@@ -312,14 +311,16 @@ def test_accept(self):
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203162
@support.requires_freebsd_version(10, 3)
@unittest.skipUnless(hasattr(os, 'mkfifo'), 'needs mkfifo()')
- @unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
def _test_open(self, do_open_close_reader, do_open_close_writer):
filename = support.TESTFN
# Use a fifo: until the child opens it for reading, the parent will
# block when trying to open it for writing.
support.unlink(filename)
- os.mkfifo(filename)
+ try:
+ os.mkfifo(filename)
+ except PermissionError as e:
+ self.skipTest('os.mkfifo(): %s' % e)
self.addCleanup(support.unlink, filename)
code = '\n'.join((
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index c8feaa870b0..0205b41a3b1 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -93,7 +93,7 @@
"check__all__", "requires_android_level", "requires_multiprocessing_queue",
# sys
"is_jython", "is_android", "check_impl_detail", "unix_shell",
- "setswitchinterval", "android_not_root",
+ "setswitchinterval",
# network
"HOST", "IPV6_ENABLED", "find_unused_port", "bind_port", "open_urlresource",
"bind_unix_socket",
@@ -779,7 +779,6 @@ def dec(*args, **kwargs):
_ANDROID_API_LEVEL = sysconfig.get_config_var('ANDROID_API_LEVEL')
is_android = (_ANDROID_API_LEVEL is not None and _ANDROID_API_LEVEL > 0)
-android_not_root = (is_android and os.geteuid() != 0)
if sys.platform != 'win32':
unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
index f698e13f68a..01e11da0980 100644
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -8,7 +8,6 @@
import unittest
import warnings
from test import support
-android_not_root = support.android_not_root
def create_file(filename, data=b'foo'):
@@ -213,9 +212,11 @@ def _test_samefile_on_link_func(self, func):
def test_samefile_on_symlink(self):
self._test_samefile_on_link_func(os.symlink)
- @unittest.skipIf(android_not_root, "hard links not allowed, non root user")
def test_samefile_on_link(self):
- self._test_samefile_on_link_func(os.link)
+ try:
+ self._test_samefile_on_link_func(os.link)
+ except PermissionError as e:
+ self.skipTest('os.link(): %s' % e)
def test_samestat(self):
test_fn1 = support.TESTFN
@@ -253,9 +254,11 @@ def _test_samestat_on_link_func(self, func):
def test_samestat_on_symlink(self):
self._test_samestat_on_link_func(os.symlink)
- @unittest.skipIf(android_not_root, "hard links not allowed, non root user")
def test_samestat_on_link(self):
- self._test_samestat_on_link_func(os.link)
+ try:
+ self._test_samestat_on_link_func(os.link)
+ except PermissionError as e:
+ self.skipTest('os.link(): %s' % e)
def test_sameopenfile(self):
filename = support.TESTFN
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 6502413a73d..6672c448f4f 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -11,7 +11,6 @@
from unittest import mock
from test import support
-android_not_root = support.android_not_root
TESTFN = support.TESTFN
try:
@@ -1914,10 +1913,12 @@ def test_is_fifo_false(self):
self.assertFalse((P / 'fileA' / 'bah').is_fifo())
@unittest.skipUnless(hasattr(os, "mkfifo"), "os.mkfifo() required")
- @unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
def test_is_fifo_true(self):
P = self.cls(BASE, 'myfifo')
- os.mkfifo(str(P))
+ try:
+ os.mkfifo(str(P))
+ except PermissionError as e:
+ self.skipTest('os.mkfifo(): %s' % e)
self.assertTrue(P.is_fifo())
self.assertFalse(P.is_socket())
self.assertFalse(P.is_file())
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 9df3206324f..85eae47b8a5 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -1,7 +1,6 @@
"Test posix functions"
from test import support
-android_not_root = support.android_not_root
# Skip these tests if there is no posix module.
posix = support.import_module('posix')
@@ -423,15 +422,16 @@ def test_stat(self):
posix.stat, list(os.fsencode(support.TESTFN)))
@unittest.skipUnless(hasattr(posix, 'mkfifo'), "don't have mkfifo()")
- @unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
def test_mkfifo(self):
support.unlink(support.TESTFN)
- posix.mkfifo(support.TESTFN, stat.S_IRUSR | stat.S_IWUSR)
+ try:
+ posix.mkfifo(support.TESTFN, stat.S_IRUSR | stat.S_IWUSR)
+ except PermissionError as e:
+ self.skipTest('posix.mkfifo(): %s' % e)
self.assertTrue(stat.S_ISFIFO(posix.stat(support.TESTFN).st_mode))
@unittest.skipUnless(hasattr(posix, 'mknod') and hasattr(stat, 'S_IFIFO'),
"don't have mknod()/S_IFIFO")
- @unittest.skipIf(android_not_root, "mknod not allowed, non root user")
def test_mknod(self):
# Test using mknod() to create a FIFO (the only use specified
# by POSIX).
@@ -442,7 +442,7 @@ def test_mknod(self):
except OSError as e:
# Some old systems don't allow unprivileged users to use
# mknod(), or only support creating device nodes.
- self.assertIn(e.errno, (errno.EPERM, errno.EINVAL))
+ self.assertIn(e.errno, (errno.EPERM, errno.EINVAL, errno.EACCES))
else:
self.assertTrue(stat.S_ISFIFO(posix.stat(support.TESTFN).st_mode))
@@ -452,7 +452,7 @@ def test_mknod(self):
posix.mknod(path=support.TESTFN, mode=mode, device=0,
dir_fd=None)
except OSError as e:
- self.assertIn(e.errno, (errno.EPERM, errno.EINVAL))
+ self.assertIn(e.errno, (errno.EPERM, errno.EINVAL, errno.EACCES))
@unittest.skipUnless(hasattr(posix, 'stat'), 'test needs posix.stat()')
@unittest.skipUnless(hasattr(posix, 'makedev'), 'test needs posix.makedev()')
@@ -937,11 +937,13 @@ def test_utime_dir_fd(self):
posix.close(f)
@unittest.skipUnless(os.link in os.supports_dir_fd, "test needs dir_fd support in os.link()")
- @unittest.skipIf(android_not_root, "hard link not allowed, non root user")
def test_link_dir_fd(self):
f = posix.open(posix.getcwd(), posix.O_RDONLY)
try:
posix.link(support.TESTFN, support.TESTFN + 'link', src_dir_fd=f, dst_dir_fd=f)
+ except PermissionError as e:
+ self.skipTest('posix.link(): %s' % e)
+ else:
# should have same inodes
self.assertEqual(posix.stat(support.TESTFN)[1],
posix.stat(support.TESTFN + 'link')[1])
@@ -961,7 +963,6 @@ def test_mkdir_dir_fd(self):
@unittest.skipUnless((os.mknod in os.supports_dir_fd) and hasattr(stat, 'S_IFIFO'),
"test requires both stat.S_IFIFO and dir_fd support for os.mknod()")
- @unittest.skipIf(android_not_root, "mknod not allowed, non root user")
def test_mknod_dir_fd(self):
# Test using mknodat() to create a FIFO (the only use specified
# by POSIX).
@@ -973,7 +974,7 @@ def test_mknod_dir_fd(self):
except OSError as e:
# Some old systems don't allow unprivileged users to use
# mknod(), or only support creating device nodes.
- self.assertIn(e.errno, (errno.EPERM, errno.EINVAL))
+ self.assertIn(e.errno, (errno.EPERM, errno.EINVAL, errno.EACCES))
else:
self.assertTrue(stat.S_ISFIFO(posix.stat(support.TESTFN).st_mode))
finally:
@@ -1045,12 +1046,15 @@ def test_unlink_dir_fd(self):
posix.close(f)
@unittest.skipUnless(os.mkfifo in os.supports_dir_fd, "test needs dir_fd support in os.mkfifo()")
- @unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
def test_mkfifo_dir_fd(self):
support.unlink(support.TESTFN)
f = posix.open(posix.getcwd(), posix.O_RDONLY)
try:
- posix.mkfifo(support.TESTFN, stat.S_IRUSR | stat.S_IWUSR, dir_fd=f)
+ try:
+ posix.mkfifo(support.TESTFN,
+ stat.S_IRUSR | stat.S_IWUSR, dir_fd=f)
+ except PermissionError as e:
+ self.skipTest('posix.mkfifo(): %s' % e)
self.assertTrue(stat.S_ISFIFO(posix.stat(support.TESTFN).st_mode))
finally:
posix.close(f)
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index b2ab1af296d..95717a48ff1 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -23,8 +23,7 @@
import warnings
from test import support
-from test.support import (TESTFN, check_warnings, captured_stdout,
- android_not_root)
+from test.support import TESTFN, check_warnings, captured_stdout
TESTFN2 = TESTFN + "2"
@@ -771,7 +770,6 @@ def test_copytree_winerror(self, mock_patch):
@unittest.skipIf(os.name == 'nt', 'temporarily disabled on Windows')
@unittest.skipUnless(hasattr(os, 'link'), 'requires os.link')
- @unittest.skipIf(android_not_root, "hard links not allowed, non root user")
def test_dont_copy_file_onto_link_to_itself(self):
# bug 851123.
os.mkdir(TESTFN)
@@ -780,7 +778,10 @@ def test_dont_copy_file_onto_link_to_itself(self):
try:
with open(src, 'w') as f:
f.write('cheddar')
- os.link(src, dst)
+ try:
+ os.link(src, dst)
+ except PermissionError as e:
+ self.skipTest('os.link(): %s' % e)
self.assertRaises(shutil.SameFileError, shutil.copyfile, src, dst)
with open(src, 'r') as f:
self.assertEqual(f.read(), 'cheddar')
@@ -824,9 +825,11 @@ def test_rmtree_on_symlink(self):
# Issue #3002: copyfile and copytree block indefinitely on named pipes
@unittest.skipUnless(hasattr(os, "mkfifo"), 'requires os.mkfifo()')
- @unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
def test_copyfile_named_pipe(self):
- os.mkfifo(TESTFN)
+ try:
+ os.mkfifo(TESTFN)
+ except PermissionError as e:
+ self.skipTest('os.mkfifo(): %s' % e)
try:
self.assertRaises(shutil.SpecialFileError,
shutil.copyfile, TESTFN, TESTFN2)
@@ -835,7 +838,6 @@ def test_copyfile_named_pipe(self):
finally:
os.remove(TESTFN)
- @unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
@unittest.skipUnless(hasattr(os, "mkfifo"), 'requires os.mkfifo()')
@support.skip_unless_symlink
def test_copytree_named_pipe(self):
@@ -844,7 +846,10 @@ def test_copytree_named_pipe(self):
subdir = os.path.join(TESTFN, "subdir")
os.mkdir(subdir)
pipe = os.path.join(subdir, "mypipe")
- os.mkfifo(pipe)
+ try:
+ os.mkfifo(pipe)
+ except PermissionError as e:
+ self.skipTest('os.mkfifo(): %s' % e)
try:
shutil.copytree(TESTFN, TESTFN2)
except shutil.Error as e:
diff --git a/Lib/test/test_stat.py b/Lib/test/test_stat.py
index cd02a6ee374..73cd901bdbf 100644
--- a/Lib/test/test_stat.py
+++ b/Lib/test/test_stat.py
@@ -1,7 +1,7 @@
import unittest
import os
import sys
-from test.support import TESTFN, import_fresh_module, android_not_root
+from test.support import TESTFN, import_fresh_module
c_stat = import_fresh_module('stat', fresh=['_stat'])
py_stat = import_fresh_module('stat', blocked=['_stat'])
@@ -168,9 +168,11 @@ def test_link(self):
self.assertS_IS("LNK", st_mode)
@unittest.skipUnless(hasattr(os, 'mkfifo'), 'os.mkfifo not available')
- @unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
def test_fifo(self):
- os.mkfifo(TESTFN, 0o700)
+ try:
+ os.mkfifo(TESTFN, 0o700)
+ except PermissionError as e:
+ self.skipTest('os.mkfifo(): %s' % e)
st_mode, modestr = self.get_mode()
self.assertEqual(modestr, 'prwx------')
self.assertS_IS("FIFO", st_mode)
More information about the Python-checkins
mailing list