tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

test_encodingutil: fixes for Unix. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-11-02 22:30:34 +00:00 committed by Brian Warner
parent 5f98d73216
commit 3fab5caa02
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/allmydata/test/test_encodingutil.py
View File

@ -447,13 +447,14 @@ class QuotePaths(ReallyEqualMixin, unittest.TestCase):
self.failUnlessReallyEqual(quote_filepath(foo_bar_fp, quotemarks=False), self.failUnlessReallyEqual(quote_filepath(foo_bar_fp, quotemarks=False),
win32_other("C:\\foo\\bar", "/foo/bar")) win32_other("C:\\foo\\bar", "/foo/bar"))
foo_longfp = FilePath(u'\\\\?\\C:\\foo') if sys.platform == "win32":
self.failUnlessReallyEqual(quote_filepath(foo_longfp), foo_longfp = FilePath(u'\\\\?\\C:\\foo')
win32_other("'C:\\foo'", "'\\\\?\\C:\\foo'")) self.failUnlessReallyEqual(quote_filepath(foo_longfp),
self.failUnlessReallyEqual(quote_filepath(foo_longfp, quotemarks=True), "'C:\\foo'")
win32_other("'C:\\foo'", "'\\\\?\\C:\\foo'")) self.failUnlessReallyEqual(quote_filepath(foo_longfp, quotemarks=True),
self.failUnlessReallyEqual(quote_filepath(foo_longfp, quotemarks=False), "'C:\\foo'")
win32_other("C:\\foo", "\\\\?\\C:\\foo")) self.failUnlessReallyEqual(quote_filepath(foo_longfp, quotemarks=False),
"C:\\foo")
class FilePaths(ReallyEqualMixin, unittest.TestCase): class FilePaths(ReallyEqualMixin, unittest.TestCase):
@ -465,7 +466,8 @@ class FilePaths(ReallyEqualMixin, unittest.TestCase):
for fp in (nosep_fp, sep_fp): for fp in (nosep_fp, sep_fp):
self.failUnlessReallyEqual(fp, FilePath(foo_u)) self.failUnlessReallyEqual(fp, FilePath(foo_u))
self.failUnlessReallyEqual(fp.path, foo_u) if encodingutil.use_unicode_filepath:
self.failUnlessReallyEqual(fp.path, foo_u)
if sys.platform == "win32": if sys.platform == "win32":
long_u = u'\\\\?\\C:\\foo' long_u = u'\\\\?\\C:\\foo'
@ -481,7 +483,8 @@ class FilePaths(ReallyEqualMixin, unittest.TestCase):
for foo_fp in (foo_bfp, foo_ufp): for foo_fp in (foo_bfp, foo_ufp):
fp = extend_filepath(foo_fp, [u'bar', u'baz']) fp = extend_filepath(foo_fp, [u'bar', u'baz'])
self.failUnlessReallyEqual(fp, FilePath(foo_bar_baz_u)) self.failUnlessReallyEqual(fp, FilePath(foo_bar_baz_u))
self.failUnlessReallyEqual(fp.path, foo_bar_baz_u) if encodingutil.use_unicode_filepath:
self.failUnlessReallyEqual(fp.path, foo_bar_baz_u)
def test_unicode_from_filepath(self): def test_unicode_from_filepath(self):
foo_bfp = FilePath(win32_other(b'C:\\foo', b'/foo')) foo_bfp = FilePath(win32_other(b'C:\\foo', b'/foo'))