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

Fix tests by submitting unicode args instead of str

Browse Source
This commit is contained in:
David Stainton 2015-10-19 16:14:12 +02:00
parent ef39ca17ba
commit 09871d76c7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/scripts/magic_folder_cli.py
View File

@ -22,7 +22,7 @@ class CreateOptions(BasedirOptions):
raise usage.UsageError("An alias must end with a ':' character.") raise usage.UsageError("An alias must end with a ':' character.")
self.alias = alias[:-1] self.alias = alias[:-1]
self.nickname = nickname self.nickname = nickname
self.localdir = argv_to_abspath(str(localdir)) self.localdir = localdir
if self.nickname and not self.localdir: if self.nickname and not self.localdir:
raise usage.UsageError("If NICKNAME is specified then LOCALDIR must also be specified.") raise usage.UsageError("If NICKNAME is specified then LOCALDIR must also be specified.")
node_url_file = os.path.join(self['node-directory'], "node.url") node_url_file = os.path.join(self['node-directory'], "node.url")

5
src/allmydata/test/test_cli_magic_folder.py
View File

@ -11,6 +11,7 @@ from allmydata.test.no_network import GridTestMixin
from .test_cli import CLITestMixin from .test_cli import CLITestMixin
from allmydata.scripts import magic_folder_cli from allmydata.scripts import magic_folder_cli
from allmydata.util.fileutil import abspath_expanduser_unicode from allmydata.util.fileutil import abspath_expanduser_unicode
from allmydata.util.encodingutil import argv_to_abspath
from allmydata.frontends.magic_folder import MagicFolder from allmydata.frontends.magic_folder import MagicFolder
from allmydata import uri from allmydata import uri
@ -175,7 +176,7 @@ class CreateMagicFolder(MagicFolderCLITestMixin, unittest.TestCase):
def test_create_and_then_invite_join(self): def test_create_and_then_invite_join(self):
self.basedir = "cli/MagicFolder/create-and-then-invite-join" self.basedir = "cli/MagicFolder/create-and-then-invite-join"
self.set_up_grid() self.set_up_grid()
self.local_dir = os.path.join(self.basedir, "magic") self.local_dir = argv_to_abspath(os.path.join(self.basedir, "magic"))
d = self.do_create_magic_folder(0) d = self.do_create_magic_folder(0)
d.addCallback(lambda x: self.do_invite(0, u"Alice")) d.addCallback(lambda x: self.do_invite(0, u"Alice"))
def get_invite((rc,stdout,stderr)): def get_invite((rc,stdout,stderr)):
@ -220,7 +221,7 @@ class CreateMagicFolder(MagicFolderCLITestMixin, unittest.TestCase):
self.basedir = "cli/MagicFolder/create-invite-join-failure" self.basedir = "cli/MagicFolder/create-invite-join-failure"
self.set_up_grid() self.set_up_grid()
self.local_dir = os.path.join(self.basedir, "magic") self.local_dir = os.path.join(self.basedir, "magic")
self.local_dir = "-" + self.local_dir self.local_dir = argv_to_abspath("-" + self.local_dir)
d = self.do_cli("magic-folder", "create", u"magic:", u"Alice", self.local_dir) d = self.do_cli("magic-folder", "create", u"magic:", u"Alice", self.local_dir)
def _done((rc,stdout,stderr)): def _done((rc,stdout,stderr)):
print "rc %s" % (rc,) print "rc %s" % (rc,)