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

All tests pass on Python 3.

This commit is contained in:
Itamar Turner-Trauring 2021-05-04 10:40:43 -04:00
parent a4af4d8e5b
commit c589e97cde
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/allmydata/test/cli/test_cli.py
View File

@ -1,7 +1,7 @@
from past.builtins import unicode from past.builtins import unicode
from six.moves import cStringIO as StringIO from six.moves import cStringIO as StringIO
from six import ensure_text from six import ensure_text, ensure_str
import os.path import os.path
import sys import sys
@ -1151,7 +1151,7 @@ class Webopen(GridTestMixin, CLITestMixin, unittest.TestCase):
# TODO: replace with @patch that supports Deferreds. # TODO: replace with @patch that supports Deferreds.
import webbrowser import webbrowser
def call_webbrowser_open(url): def call_webbrowser_open(url):
self.failUnlessIn(self.alias_uri.replace(':', '%3A'), url) self.failUnlessIn(unicode(self.alias_uri, "ascii").replace(':', '%3A'), url)
self.webbrowser_open_called = True self.webbrowser_open_called = True
def _cleanup(res): def _cleanup(res):
webbrowser.open = self.old_webbrowser_open webbrowser.open = self.old_webbrowser_open
@ -1332,7 +1332,7 @@ class Run(unittest.TestCase):
If the pidfile exists but does not contain a numeric value, a complaint to If the pidfile exists but does not contain a numeric value, a complaint to
this effect is written to stderr. this effect is written to stderr.
""" """
basedir = FilePath(self.mktemp().decode("ascii")) basedir = FilePath(ensure_str(self.mktemp()))
basedir.makedirs() basedir.makedirs()
basedir.child(u"twistd.pid").setContent(b"foo") basedir.child(u"twistd.pid").setContent(b"foo")
basedir.child(u"tahoe-client.tac").setContent(b"") basedir.child(u"tahoe-client.tac").setContent(b"")
@ -1340,7 +1340,7 @@ class Run(unittest.TestCase):
config = tahoe_run.RunOptions() config = tahoe_run.RunOptions()
config.stdout = StringIO() config.stdout = StringIO()
config.stderr = StringIO() config.stderr = StringIO()
config['basedir'] = basedir.path config['basedir'] = ensure_text(basedir.path)
config.twistd_args = [] config.twistd_args = []
result_code = tahoe_run.run(config) result_code = tahoe_run.run(config)