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

type cleanups

Browse Source
This commit is contained in:
Jean-Paul Calderone 2021-03-24 13:54:10 -04:00
parent 3963979fbd
commit 00de3b9e7e
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/allmydata/test/cli/test_invite.py
View File

@ -4,7 +4,7 @@ import json
from os.path import join
try:
from typing import Optional, Tuple
from typing import Optional, Sequence
except ImportError:
pass
@ -149,9 +149,8 @@ class Invite(GridTestMixin, CLITestMixin, unittest.TestCase):
intro_dir,
)
def _invite_success(self, extra_args=(), tahoe_config=None):
# type: (Tuple[bytes], Optional[bytes]) -> defer.Deferred
# type: (Sequence[bytes], Optional[bytes]) -> defer.Deferred
"""
Exercise an expected-success case of ``tahoe invite``.
@ -165,11 +164,12 @@ class Invite(GridTestMixin, CLITestMixin, unittest.TestCase):
# we've never run the introducer, so it hasn't created
# introducer.furl yet
priv_dir = join(intro_dir, "private")
with open(join(priv_dir, "introducer.furl"), "w") as f:
f.write("pb://fooblam\n")
with open(join(priv_dir, "introducer.furl"), "w") as fobj_intro:
fobj_intro.write("pb://fooblam\n")
if tahoe_config is not None:
with open(join(intro_dir, "tahoe.cfg"), "w") as f:
f.write(tahoe_config)
assert isinstance(tahoe_config, bytes)
with open(join(intro_dir, "tahoe.cfg"), "wb") as fobj_cfg:
fobj_cfg.write(tahoe_config)
with mock.patch('allmydata.scripts.tahoe_invite.wormhole') as w:
fake_wh = _create_fake_wormhole([
@ -177,6 +177,14 @@ class Invite(GridTestMixin, CLITestMixin, unittest.TestCase):
])
w.create = mock.Mock(return_value=fake_wh)
extra_args = tuple(extra_args)
d = run_cli(
"-d", intro_dir,
"invite",
*(extra_args + ("foo",))
)
def done(result):
rc, out, err = result
self.assertEqual(2, len(fake_wh.messages))
@ -197,11 +205,6 @@ class Invite(GridTestMixin, CLITestMixin, unittest.TestCase):
invite["introducer"], "pb://fooblam",
)
return invite
d = run_cli(
"-d", intro_dir,
"invite",
*(extra_args + ("foo",))
)
d.addCallback(done)
return d
@ -211,9 +214,9 @@ class Invite(GridTestMixin, CLITestMixin, unittest.TestCase):
successfully send an invite
"""
invite = yield self._invite_success((
"--shares-needed", "1",
"--shares-happy", "2",
"--shares-total", "3",
b"--shares-needed", b"1",
b"--shares-happy", b"2",
b"--shares-total", b"3",
))
self.assertEqual(
invite["shares-needed"], "1",
@ -231,7 +234,7 @@ class Invite(GridTestMixin, CLITestMixin, unittest.TestCase):
If ``--shares-{needed,happy,total}`` are not given on the command line
then the invitation is generated using the configured values.
"""
invite = yield self._invite_success(tahoe_config="""
invite = yield self._invite_success(tahoe_config=b"""
[client]
shares.needed = 2
shares.happy = 4