mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
Issue #28759: Fix the tests that fail with PermissionError when run as
a non-root user on Android where access rights are controled by SELinux MAC.
This commit is contained in:
parent
fb24eead48
commit
3a4e989324
7 changed files with 22 additions and 3 deletions
|
@ -20,6 +20,7 @@ import time
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from test import support
|
from test import support
|
||||||
|
android_not_root = support.android_not_root
|
||||||
|
|
||||||
@contextlib.contextmanager
|
@contextlib.contextmanager
|
||||||
def kill_on_error(proc):
|
def kill_on_error(proc):
|
||||||
|
@ -311,6 +312,7 @@ class SocketEINTRTest(EINTRBaseTest):
|
||||||
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203162
|
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203162
|
||||||
@support.requires_freebsd_version(10, 3)
|
@support.requires_freebsd_version(10, 3)
|
||||||
@unittest.skipUnless(hasattr(os, 'mkfifo'), 'needs mkfifo()')
|
@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):
|
def _test_open(self, do_open_close_reader, do_open_close_writer):
|
||||||
filename = support.TESTFN
|
filename = support.TESTFN
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ __all__ = [
|
||||||
"check__all__", "requires_android_level", "requires_multiprocessing_queue",
|
"check__all__", "requires_android_level", "requires_multiprocessing_queue",
|
||||||
# sys
|
# sys
|
||||||
"is_jython", "is_android", "check_impl_detail", "unix_shell",
|
"is_jython", "is_android", "check_impl_detail", "unix_shell",
|
||||||
"setswitchinterval",
|
"setswitchinterval", "android_not_root",
|
||||||
# network
|
# network
|
||||||
"HOST", "IPV6_ENABLED", "find_unused_port", "bind_port", "open_urlresource",
|
"HOST", "IPV6_ENABLED", "find_unused_port", "bind_port", "open_urlresource",
|
||||||
# processes
|
# processes
|
||||||
|
@ -769,6 +769,7 @@ is_jython = sys.platform.startswith('java')
|
||||||
|
|
||||||
_ANDROID_API_LEVEL = sysconfig.get_config_var('ANDROID_API_LEVEL')
|
_ANDROID_API_LEVEL = sysconfig.get_config_var('ANDROID_API_LEVEL')
|
||||||
is_android = (_ANDROID_API_LEVEL is not None and _ANDROID_API_LEVEL > 0)
|
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':
|
if sys.platform != 'win32':
|
||||||
unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
|
unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
|
||||||
|
|
|
@ -8,6 +8,7 @@ import sys
|
||||||
import unittest
|
import unittest
|
||||||
import warnings
|
import warnings
|
||||||
from test import support
|
from test import support
|
||||||
|
android_not_root = support.android_not_root
|
||||||
|
|
||||||
|
|
||||||
def create_file(filename, data=b'foo'):
|
def create_file(filename, data=b'foo'):
|
||||||
|
@ -212,6 +213,7 @@ class GenericTest:
|
||||||
def test_samefile_on_symlink(self):
|
def test_samefile_on_symlink(self):
|
||||||
self._test_samefile_on_link_func(os.symlink)
|
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):
|
def test_samefile_on_link(self):
|
||||||
self._test_samefile_on_link_func(os.link)
|
self._test_samefile_on_link_func(os.link)
|
||||||
|
|
||||||
|
@ -251,6 +253,7 @@ class GenericTest:
|
||||||
def test_samestat_on_symlink(self):
|
def test_samestat_on_symlink(self):
|
||||||
self._test_samestat_on_link_func(os.symlink)
|
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):
|
def test_samestat_on_link(self):
|
||||||
self._test_samestat_on_link_func(os.link)
|
self._test_samestat_on_link_func(os.link)
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ import tempfile
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from test import support
|
from test import support
|
||||||
|
android_not_root = support.android_not_root
|
||||||
TESTFN = support.TESTFN
|
TESTFN = support.TESTFN
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -1864,6 +1865,7 @@ class _BasePathTest(object):
|
||||||
self.assertFalse((P / 'fileA' / 'bah').is_fifo())
|
self.assertFalse((P / 'fileA' / 'bah').is_fifo())
|
||||||
|
|
||||||
@unittest.skipUnless(hasattr(os, "mkfifo"), "os.mkfifo() required")
|
@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):
|
def test_is_fifo_true(self):
|
||||||
P = self.cls(BASE, 'myfifo')
|
P = self.cls(BASE, 'myfifo')
|
||||||
os.mkfifo(str(P))
|
os.mkfifo(str(P))
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
"Test posix functions"
|
"Test posix functions"
|
||||||
|
|
||||||
from test import support
|
from test import support
|
||||||
|
android_not_root = support.android_not_root
|
||||||
|
|
||||||
# Skip these tests if there is no posix module.
|
# Skip these tests if there is no posix module.
|
||||||
posix = support.import_module('posix')
|
posix = support.import_module('posix')
|
||||||
|
@ -422,6 +423,7 @@ class PosixTester(unittest.TestCase):
|
||||||
posix.stat, list(os.fsencode(support.TESTFN)))
|
posix.stat, list(os.fsencode(support.TESTFN)))
|
||||||
|
|
||||||
@unittest.skipUnless(hasattr(posix, 'mkfifo'), "don't have mkfifo()")
|
@unittest.skipUnless(hasattr(posix, 'mkfifo'), "don't have mkfifo()")
|
||||||
|
@unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
|
||||||
def test_mkfifo(self):
|
def test_mkfifo(self):
|
||||||
support.unlink(support.TESTFN)
|
support.unlink(support.TESTFN)
|
||||||
posix.mkfifo(support.TESTFN, stat.S_IRUSR | stat.S_IWUSR)
|
posix.mkfifo(support.TESTFN, stat.S_IRUSR | stat.S_IWUSR)
|
||||||
|
@ -429,6 +431,7 @@ class PosixTester(unittest.TestCase):
|
||||||
|
|
||||||
@unittest.skipUnless(hasattr(posix, 'mknod') and hasattr(stat, 'S_IFIFO'),
|
@unittest.skipUnless(hasattr(posix, 'mknod') and hasattr(stat, 'S_IFIFO'),
|
||||||
"don't have mknod()/S_IFIFO")
|
"don't have mknod()/S_IFIFO")
|
||||||
|
@unittest.skipIf(android_not_root, "mknod not allowed, non root user")
|
||||||
def test_mknod(self):
|
def test_mknod(self):
|
||||||
# Test using mknod() to create a FIFO (the only use specified
|
# Test using mknod() to create a FIFO (the only use specified
|
||||||
# by POSIX).
|
# by POSIX).
|
||||||
|
@ -907,6 +910,7 @@ class PosixTester(unittest.TestCase):
|
||||||
posix.close(f)
|
posix.close(f)
|
||||||
|
|
||||||
@unittest.skipUnless(os.link in os.supports_dir_fd, "test needs dir_fd support in os.link()")
|
@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):
|
def test_link_dir_fd(self):
|
||||||
f = posix.open(posix.getcwd(), posix.O_RDONLY)
|
f = posix.open(posix.getcwd(), posix.O_RDONLY)
|
||||||
try:
|
try:
|
||||||
|
@ -930,6 +934,7 @@ class PosixTester(unittest.TestCase):
|
||||||
|
|
||||||
@unittest.skipUnless((os.mknod in os.supports_dir_fd) and hasattr(stat, 'S_IFIFO'),
|
@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()")
|
"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):
|
def test_mknod_dir_fd(self):
|
||||||
# Test using mknodat() to create a FIFO (the only use specified
|
# Test using mknodat() to create a FIFO (the only use specified
|
||||||
# by POSIX).
|
# by POSIX).
|
||||||
|
@ -1013,6 +1018,7 @@ class PosixTester(unittest.TestCase):
|
||||||
posix.close(f)
|
posix.close(f)
|
||||||
|
|
||||||
@unittest.skipUnless(os.mkfifo in os.supports_dir_fd, "test needs dir_fd support in os.mkfifo()")
|
@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):
|
def test_mkfifo_dir_fd(self):
|
||||||
support.unlink(support.TESTFN)
|
support.unlink(support.TESTFN)
|
||||||
f = posix.open(posix.getcwd(), posix.O_RDONLY)
|
f = posix.open(posix.getcwd(), posix.O_RDONLY)
|
||||||
|
|
|
@ -22,7 +22,8 @@ import tarfile
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
from test import support
|
from test import support
|
||||||
from test.support import TESTFN, check_warnings, captured_stdout, requires_zlib
|
from test.support import (TESTFN, check_warnings, captured_stdout,
|
||||||
|
requires_zlib, android_not_root)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import bz2
|
import bz2
|
||||||
|
@ -787,6 +788,7 @@ class TestShutil(unittest.TestCase):
|
||||||
|
|
||||||
@unittest.skipIf(os.name == 'nt', 'temporarily disabled on Windows')
|
@unittest.skipIf(os.name == 'nt', 'temporarily disabled on Windows')
|
||||||
@unittest.skipUnless(hasattr(os, 'link'), 'requires os.link')
|
@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):
|
def test_dont_copy_file_onto_link_to_itself(self):
|
||||||
# bug 851123.
|
# bug 851123.
|
||||||
os.mkdir(TESTFN)
|
os.mkdir(TESTFN)
|
||||||
|
@ -839,6 +841,7 @@ class TestShutil(unittest.TestCase):
|
||||||
|
|
||||||
# Issue #3002: copyfile and copytree block indefinitely on named pipes
|
# Issue #3002: copyfile and copytree block indefinitely on named pipes
|
||||||
@unittest.skipUnless(hasattr(os, "mkfifo"), 'requires os.mkfifo()')
|
@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):
|
def test_copyfile_named_pipe(self):
|
||||||
os.mkfifo(TESTFN)
|
os.mkfifo(TESTFN)
|
||||||
try:
|
try:
|
||||||
|
@ -849,6 +852,7 @@ class TestShutil(unittest.TestCase):
|
||||||
finally:
|
finally:
|
||||||
os.remove(TESTFN)
|
os.remove(TESTFN)
|
||||||
|
|
||||||
|
@unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
|
||||||
@unittest.skipUnless(hasattr(os, "mkfifo"), 'requires os.mkfifo()')
|
@unittest.skipUnless(hasattr(os, "mkfifo"), 'requires os.mkfifo()')
|
||||||
@support.skip_unless_symlink
|
@support.skip_unless_symlink
|
||||||
def test_copytree_named_pipe(self):
|
def test_copytree_named_pipe(self):
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import unittest
|
import unittest
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
from test.support import TESTFN, import_fresh_module
|
from test.support import TESTFN, import_fresh_module, android_not_root
|
||||||
|
|
||||||
c_stat = import_fresh_module('stat', fresh=['_stat'])
|
c_stat = import_fresh_module('stat', fresh=['_stat'])
|
||||||
py_stat = import_fresh_module('stat', blocked=['_stat'])
|
py_stat = import_fresh_module('stat', blocked=['_stat'])
|
||||||
|
@ -168,6 +168,7 @@ class TestFilemode:
|
||||||
self.assertS_IS("LNK", st_mode)
|
self.assertS_IS("LNK", st_mode)
|
||||||
|
|
||||||
@unittest.skipUnless(hasattr(os, 'mkfifo'), 'os.mkfifo not available')
|
@unittest.skipUnless(hasattr(os, 'mkfifo'), 'os.mkfifo not available')
|
||||||
|
@unittest.skipIf(android_not_root, "mkfifo not allowed, non root user")
|
||||||
def test_fifo(self):
|
def test_fifo(self):
|
||||||
os.mkfifo(TESTFN, 0o700)
|
os.mkfifo(TESTFN, 0o700)
|
||||||
st_mode, modestr = self.get_mode()
|
st_mode, modestr = self.get_mode()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue