ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-18 17:00:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_alias: skip unicode tests on non-unicode platform

Browse Source 
This was flunking the OS-X buildbot, which runs in an environment without
$LANG being set, and thus encodingutil deduces (correctly but unhelpfully)
that we're limited to ASCII. Other tests detect this situation and raise
SkipTest, so let's do that here too.
This commit is contained in:
Brian Warner 2018-03-27 15:56:10 -07:00
parent 906c4f4f32
commit 0964bc0d05
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/allmydata/test/cli/test_alias.py
View File

@ -4,7 +4,7 @@ from mock import patch
from twisted.trial import unittest from twisted.trial import unittest
from twisted.internet.defer import inlineCallbacks from twisted.internet.defer import inlineCallbacks
from allmydata.util.encodingutil import unicode_to_argv from allmydata.util.encodingutil import unicode_to_argv, get_io_encoding
from allmydata.scripts.common import get_aliases from allmydata.scripts.common import get_aliases
from allmydata.test.no_network import GridTestMixin from allmydata.test.no_network import GridTestMixin
from .common import CLITestMixin from .common import CLITestMixin
@ -12,6 +12,13 @@ from .common import CLITestMixin
# see also test_create_alias # see also test_create_alias
def skip_unless_unicode():
try:
etudes_arg = u"\u00E9tudes".encode(get_io_encoding())
del etudes_arg
except UnicodeEncodeError:
raise unittest.SkipTest("A non-ASCII command argument could not be encoded on this platform.")
class ListAlias(GridTestMixin, CLITestMixin, unittest.TestCase): class ListAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
@ -48,6 +55,7 @@ class ListAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
this this
""" """
self.basedir = "cli/ListAlias/test_list_unicode_mismatch_json" self.basedir = "cli/ListAlias/test_list_unicode_mismatch_json"
skip_unless_unicode()
self.set_up_grid(oneshare=True) self.set_up_grid(oneshare=True)
rc, stdout, stderr = yield self.do_cli( rc, stdout, stderr = yield self.do_cli(
@ -79,6 +87,7 @@ class ListAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
@inlineCallbacks @inlineCallbacks
def test_list_unicode_mismatch(self): def test_list_unicode_mismatch(self):
self.basedir = "cli/ListAlias/test_list_unicode_mismatch" self.basedir = "cli/ListAlias/test_list_unicode_mismatch"
skip_unless_unicode()
self.set_up_grid(oneshare=True) self.set_up_grid(oneshare=True)
rc, stdout, stderr = yield self.do_cli( rc, stdout, stderr = yield self.do_cli(