ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 16:36:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Port to Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-04-30 11:15:48 -04:00
parent 3846df8e4f
commit da8e0d61aa
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/allmydata/test/cli/test_create_alias.py
View File

@ -1,4 +1,16 @@
from future.builtins import str """
Ported to Python 3.
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
from future.utils import PY2
if PY2:
from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401
from six import ensure_str
from six.moves import StringIO from six.moves import StringIO
import os.path import os.path
from twisted.trial import unittest from twisted.trial import unittest
@ -170,7 +182,7 @@ class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
(rc, out, err) = args (rc, out, err) = args
self.failUnlessReallyEqual(rc, 0) self.failUnlessReallyEqual(rc, 0)
self.assertEqual(len(err), 0, err) self.assertEqual(len(err), 0, err)
self.failUnlessIn("Alias %s created" % quote_output(u"\u00E9tudes"), out) self.failUnlessIn(ensure_str("Alias %s created") % quote_output(etudes_arg), out)
aliases = get_aliases(self.get_clientdir()) aliases = get_aliases(self.get_clientdir())
self.failUnless(aliases[u"\u00E9tudes"].startswith(b"URI:DIR2:")) self.failUnless(aliases[u"\u00E9tudes"].startswith(b"URI:DIR2:"))
@ -193,7 +205,7 @@ class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
(rc, out, err) = args (rc, out, err) = args
self.failUnlessReallyEqual(rc, 0) self.failUnlessReallyEqual(rc, 0)
self.assertEqual(len(err), 0, err) self.assertEqual(len(err), 0, err)
self.failUnlessReallyEqual(out, "uploaded.txt\n") self.assertEqual(out, "uploaded.txt\n")
d.addCallback(_check_ls2) d.addCallback(_check_ls2)
d.addCallback(lambda res: self.do_cli("get", etudes_arg + ":uploaded.txt", d.addCallback(lambda res: self.do_cli("get", etudes_arg + ":uploaded.txt",
@ -207,15 +219,17 @@ class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
# Ensure that an Unicode filename in an Unicode alias works as expected # Ensure that an Unicode filename in an Unicode alias works as expected
d.addCallback(lambda res: self.do_cli("put", "-", etudes_arg + ":" + lumiere_arg, d.addCallback(lambda res: self.do_cli("put", "-", etudes_arg + ":" + lumiere_arg,
stdin="Let the sunshine In!")) stdin=b"Let the sunshine In!"))
d.addCallback(lambda res: self.do_cli("get", d.addCallback(lambda res: self.do_cli(
str(get_aliases(self.get_clientdir())[u"\u00E9tudes"], "ascii") + "/" + lumiere_arg)) "get",
str(get_aliases(self.get_clientdir())[u"\u00E9tudes"], "ascii") + "/" + lumiere_arg,
return_bytes=True))
def _check_get2(args): def _check_get2(args):
(rc, out, err) = args (rc, out, err) = args
self.failUnlessReallyEqual(rc, 0) self.failUnlessReallyEqual(rc, 0)
self.assertEqual(len(err), 0, err) self.assertEqual(len(err), 0, err)
self.failUnlessReallyEqual(out, "Let the sunshine In!") self.failUnlessReallyEqual(out, b"Let the sunshine In!")
d.addCallback(_check_get2) d.addCallback(_check_get2)
return d return d

1
src/allmydata/util/_python3.py
View File

@ -179,6 +179,7 @@ PORTED_TEST_MODULES = [
"allmydata.test.cli.test_check", "allmydata.test.cli.test_check",
"allmydata.test.cli.test_cp", "allmydata.test.cli.test_cp",
"allmydata.test.cli.test_create", "allmydata.test.cli.test_create",
"allmydata.test.cli.test_create_alias",
"allmydata.test.cli.test_invite", "allmydata.test.cli.test_invite",
"allmydata.test.cli.test_status", "allmydata.test.cli.test_status",