Unverified Kaydet (Commit) 6a55d095 authored tarafından xdegaye's avatar xdegaye Kaydeden (comit) GitHub

bpo-29180: Skip test_os tests on PermissionError raised by Android (GH-4374)

üst 92c2ca76
...@@ -1736,7 +1736,10 @@ class LinkTests(unittest.TestCase): ...@@ -1736,7 +1736,10 @@ class LinkTests(unittest.TestCase):
def _test_link(self, file1, file2): def _test_link(self, file1, file2):
create_file(file1) create_file(file1)
os.link(file1, file2) try:
os.link(file1, file2)
except PermissionError as e:
self.skipTest('os.link(): %s' % e)
with open(file1, "r") as f1, open(file2, "r") as f2: with open(file1, "r") as f1, open(file2, "r") as f2:
self.assertTrue(os.path.sameopenfile(f1.fileno(), f2.fileno())) self.assertTrue(os.path.sameopenfile(f1.fileno(), f2.fileno()))
...@@ -2888,7 +2891,8 @@ class TermsizeTests(unittest.TestCase): ...@@ -2888,7 +2891,8 @@ class TermsizeTests(unittest.TestCase):
""" """
try: try:
size = subprocess.check_output(['stty', 'size']).decode().split() size = subprocess.check_output(['stty', 'size']).decode().split()
except (FileNotFoundError, subprocess.CalledProcessError): except (FileNotFoundError, subprocess.CalledProcessError,
PermissionError):
self.skipTest("stty invocation failed") self.skipTest("stty invocation failed")
expected = (int(size[1]), int(size[0])) # reversed order expected = (int(size[1]), int(size[0])) # reversed order
...@@ -3242,7 +3246,10 @@ class TestScandir(unittest.TestCase): ...@@ -3242,7 +3246,10 @@ class TestScandir(unittest.TestCase):
os.mkdir(dirname) os.mkdir(dirname)
filename = self.create_file("file.txt") filename = self.create_file("file.txt")
if link: if link:
os.link(filename, os.path.join(self.path, "link_file.txt")) try:
os.link(filename, os.path.join(self.path, "link_file.txt"))
except PermissionError as e:
self.skipTest('os.link(): %s' % e)
if symlink: if symlink:
os.symlink(dirname, os.path.join(self.path, "symlink_dir"), os.symlink(dirname, os.path.join(self.path, "symlink_dir"),
target_is_directory=True) target_is_directory=True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment