From 6a55d09573e5c35c9e4a24a6f811120b41a2a994 Mon Sep 17 00:00:00 2001 From: xdegaye Date: Sun, 12 Nov 2017 17:57:04 +0100 Subject: bpo-29180: Skip test_os tests on PermissionError raised by Android (GH-4374) --- Lib/test/test_os.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index ff19fac..96ee3ee 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1736,7 +1736,10 @@ class LinkTests(unittest.TestCase): def _test_link(self, file1, file2): 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: self.assertTrue(os.path.sameopenfile(f1.fileno(), f2.fileno())) @@ -2888,7 +2891,8 @@ class TermsizeTests(unittest.TestCase): """ try: size = subprocess.check_output(['stty', 'size']).decode().split() - except (FileNotFoundError, subprocess.CalledProcessError): + except (FileNotFoundError, subprocess.CalledProcessError, + PermissionError): self.skipTest("stty invocation failed") expected = (int(size[1]), int(size[0])) # reversed order @@ -3242,7 +3246,10 @@ class TestScandir(unittest.TestCase): os.mkdir(dirname) filename = self.create_file("file.txt") 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: os.symlink(dirname, os.path.join(self.path, "symlink_dir"), target_is_directory=True) -- cgit v0.12