diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-20 22:34:21 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-20 22:34:21 (GMT) |
commit | 9e9af21d45e8f5c9debd799fd521a87b0d97c698 (patch) | |
tree | 1f08df7914d1f2d817c2c7916537d4dda5465eda /Lib/test/test_posixpath.py | |
parent | 18d5a6966980387051e5c1012d9a87a46eda3d34 (diff) | |
download | cpython-9e9af21d45e8f5c9debd799fd521a87b0d97c698.zip cpython-9e9af21d45e8f5c9debd799fd521a87b0d97c698.tar.gz cpython-9e9af21d45e8f5c9debd799fd521a87b0d97c698.tar.bz2 |
skip tests with a non-ascii cwd when the file system encoding is ascii
Diffstat (limited to 'Lib/test/test_posixpath.py')
-rw-r--r-- | Lib/test/test_posixpath.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index da5d174..23a88e3 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -1,6 +1,8 @@ import unittest from test import test_support +import test_genericpath + import posixpath, os from posixpath import realpath, abspath, dirname, basename @@ -382,17 +384,13 @@ class PosixPathTest(unittest.TestCase): def test_abspath(self): self.assertIn("foo", posixpath.abspath("foo")) + self.assertRaises(TypeError, posixpath.abspath) - # Issue 3426: check that abspath retuns unicode when the arg is unicode - # and str when it's str, with both ASCII and non-ASCII cwds - for cwd in (u'cwd', u'\xe7w\xf0'): - with test_support.temp_cwd(cwd): - for path in ('', 'foo', 'f\xf2\xf2', '/foo', 'C:\\'): - self.assertIsInstance(posixpath.abspath(path), str) - for upath in (u'', u'fuu', u'f\xf9\xf9', u'/fuu', u'U:\\'): - self.assertIsInstance(posixpath.abspath(upath), unicode) + def test_abspath_with_ascii_cwd(self): + test_genericpath._issue3426(self, u'cwd', posixpath.abspath) - self.assertRaises(TypeError, posixpath.abspath) + def test_abspath_with_nonascii_cwd(self): + test_genericpath._issue3426(self, u'\xe7w\xf0', posixpath.abspath) def test_realpath(self): self.assertIn("foo", realpath("foo")) |