ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-31 15:50:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_cli.py: Fix tests when sys.stdout.encoding=None and refactor this code into functions

Browse Source
This commit is contained in:
Francois Deppierraz 2010-05-20 01:44:47 -07:00
parent 496802420e
commit 6c70fb7b3c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/allmydata/test/test_cli.py
View File

@ -32,6 +32,13 @@ from allmydata.util.stringutils import listdir_unicode, open_unicode, \
timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
def skip_non_unicode_fs():
if sys.getfilesystemencoding() not in ('UTF-8', 'mbcs'):
raise unittest.SkipTest("Arbitrary filenames are not supported by this platform")
def skip_non_unicode_stdout():
if not sys.stdout.encoding or sys.stdout.encoding not in ('UTF-8'):
raise unittest.SkipTest("Arbitrary command-line arguments (argv) are not supported by this platform")
class CLI(unittest.TestCase):
# this test case only looks at argument-processing and simple stuff.
@ -630,11 +637,8 @@ class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
def test_create_unicode(self):
if sys.getfilesystemencoding() not in ('UTF-8', 'mbcs'):
raise unittest.SkipTest("Arbitrary filenames are not supported by this platform")
if sys.stdout.encoding not in ('UTF-8'):
raise unittest.SkipTest("Arbitrary command-line arguments (argv) are not supported by this platform")
skip_non_unicode_fs()
skip_non_unicode_stdout()
self.basedir = "cli/CreateAlias/create_unicode"
self.set_up_grid()
@ -967,8 +971,7 @@ class Put(GridTestMixin, CLITestMixin, unittest.TestCase):
def test_immutable_from_file_unicode(self):
if sys.stdout.encoding not in ('UTF-8'):
raise unittest.SkipTest("Arbitrary command-line arguments (argv) are not supported by this platform")
skip_non_unicode_stdout()
# tahoe put file.txt "à trier.txt"
self.basedir = os.path.dirname(self.mktemp())
@ -1281,11 +1284,8 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
o.parseOptions, ["onearg"])
def test_unicode_filename(self):
if sys.getfilesystemencoding() not in ('UTF-8', 'mbcs'):
raise unittest.SkipTest("Arbitrary filenames are not supported by this platform")
if sys.stdout.encoding not in ('UTF-8'):
raise unittest.SkipTest("Arbitrary command-line arguments (argv) are not supported by this platform")
skip_non_unicode_fs()
skip_non_unicode_stdout()
self.basedir = "cli/Cp/unicode_filename"
self.set_up_grid()