[Python-checkins] cpython (merge 3.5 -> default): Issue #13849: Merge from 3.5

Sat Jul 23 00:32:16 EDT 2016

https://hg.python.org/cpython/rev/9498736fbd8f
changeset: 102427:9498736fbd8f
parent: 102424:5424252ce174
parent: 102426:899f06eb390c
user: Berker Peksag <berker.peksag at gmail.com>
date: Sat Jul 23 07:32:14 2016 +0300
summary:
 Issue #13849: Merge from 3.5
files:
 Lib/test/test_genericpath.py | 9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -272,6 +272,15 @@
 # and is only meant to be inherited by others.
 pathmodule = genericpath
 
+ def test_null_bytes(self):
+ for attr in GenericTest.common_attributes:
+ # os.path.commonprefix doesn't raise ValueError
+ if attr == 'commonprefix':
+ continue
+ with self.subTest(attr=attr):
+ with self.assertRaises(ValueError) as cm:
+ getattr(self.pathmodule, attr)('/tmp\x00abcds')
+ self.assertEqual(str(cm.exception), 'embedded null byte')
 
 # Following TestCase is not supposed to be run from test_genericpath.
 # It is inherited by other test modules (macpath, ntpath, posixpath).
-- 
Repository URL: https://hg.python.org/cpython
