1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #28662: Merge 3.6

Browse Source
This commit is contained in:
Xavier de Gaye 2016-11-14 17:15:45 +01:00
commit bdc33e1dae
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_dtrace.py
View File

@ -79,7 +79,7 @@ class TraceBackend:
try: try:
output = self.trace(abspath("assert_usable" + self.EXTENSION)) output = self.trace(abspath("assert_usable" + self.EXTENSION))
output = output.strip() output = output.strip()
except FileNotFoundError as fnfe: except (FileNotFoundError, PermissionError) as fnfe:
output = str(fnfe) output = str(fnfe)
if output != "probe: success": if output != "probe: success":
raise unittest.SkipTest( raise unittest.SkipTest(

3
Lib/test/test_shutil.py
View File

@ -1869,7 +1869,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, PermissionError,
subprocess.CalledProcessError):
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

5
Lib/test/test_subprocess.py
View File

@ -293,7 +293,8 @@ class ProcessTestCase(BaseTestCase):
# Verify first that the call succeeds without the executable arg. # Verify first that the call succeeds without the executable arg.
pre_args = [sys.executable, "-c"] pre_args = [sys.executable, "-c"]
self._assert_python(pre_args) self._assert_python(pre_args)
self.assertRaises(FileNotFoundError, self._assert_python, pre_args, self.assertRaises((FileNotFoundError, PermissionError),
self._assert_python, pre_args,
executable="doesnotexist") executable="doesnotexist")
@unittest.skipIf(mswindows, "executable argument replaces shell") @unittest.skipIf(mswindows, "executable argument replaces shell")
@ -2753,7 +2754,7 @@ class ContextManagerTests(BaseTestCase):
self.assertEqual(proc.returncode, 1) self.assertEqual(proc.returncode, 1)
def test_invalid_args(self): def test_invalid_args(self):
with self.assertRaises(FileNotFoundError) as c: with self.assertRaises((FileNotFoundError, PermissionError)) as c:
with subprocess.Popen(['nonexisting_i_hope'], with subprocess.Popen(['nonexisting_i_hope'],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) as proc: stderr=subprocess.PIPE) as proc: