From: david-sarah Date: Fri, 18 Jun 2010 04:51:10 +0000 (-0700) Subject: test_cli.py: fix test failure in CLI.test_listdir_unicode_good due to filenames retur... X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/frontends/%22news.html?a=commitdiff_plain;h=390fc78a9a68b42c661275733230780d61e3b967;p=tahoe-lafs%2Ftahoe-lafs.git test_cli.py: fix test failure in CLI.test_listdir_unicode_good due to filenames returned from listdir_unicode no longer being normalized. --- diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py index 2e09bad8..ef6090aa 100644 --- a/src/allmydata/test/test_cli.py +++ b/src/allmydata/test/test_cli.py @@ -9,6 +9,7 @@ import simplejson from allmydata.util import fileutil, hashutil, base32 from allmydata import uri from allmydata.immutable import upload +from allmydata.dirnode import normalize # Test that the scripts can be imported -- although the actual tests of their # functionality are done by invoking them in a subprocess. @@ -429,7 +430,7 @@ class CLI(CLITestMixin, unittest.TestCase): self.failUnlessRaises(common.UnknownAliasError, ga5, u"C:\\Windows") def test_listdir_unicode_good(self): - filenames = [u'Lôzane', u'Bern', u'Genève'] + filenames = [u'Lôzane', u'Bern', u'Genève'] # must be NFC for name in filenames: self.skip_if_cannot_represent_filename(name) @@ -441,7 +442,7 @@ class CLI(CLITestMixin, unittest.TestCase): open_unicode(os.path.join(unicode(basedir), name), "wb").close() for file in listdir_unicode(unicode(basedir)): - self.failUnlessIn(file, filenames) + self.failUnlessIn(normalize(file), filenames) class Help(unittest.TestCase):