ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-30 09:48:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add comments and blank lines to make setup_alice_and_bob more readable

Browse Source
This commit is contained in:
David Stainton 2015-07-15 15:33:33 -07:00 committed by Daira Hopwood
parent 444c732f81
commit 598695010a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,9 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
self.mkdir_nonascii(bob_dir) self.mkdir_nonascii(bob_dir)
bob_magic_dir = abspath_expanduser_unicode(u"Bob-magic", base=self.basedir) bob_magic_dir = abspath_expanduser_unicode(u"Bob-magic", base=self.basedir)
self.mkdir_nonascii(bob_magic_dir) self.mkdir_nonascii(bob_magic_dir)
# Alice creates a Magic Folder,
# invites herself then and joins.
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_invitecode(result): def get_invitecode(result):
@ -131,6 +134,8 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
self.alice_magicfolder = self.init_magicfolder(0, self.alice_upload_dircap, self.alice_collective_dircap, alice_magic_dir) self.alice_magicfolder = self.init_magicfolder(0, self.alice_upload_dircap, self.alice_collective_dircap, alice_magic_dir)
return result return result
d.addCallback(get_Alice_magicfolder) d.addCallback(get_Alice_magicfolder)
# Alice invites Bob. Bob joins.
d.addCallback(lambda x: self.do_invite(0, u"Bob")) d.addCallback(lambda x: self.do_invite(0, u"Bob"))
def get_invitecode(result): def get_invitecode(result):
self.invitecode = result[1].strip() self.invitecode = result[1].strip()
@ -145,6 +150,7 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
self.bob_magicfolder = self.init_magicfolder(1, self.bob_upload_dircap, self.bob_collective_dircap, bob_magic_dir) self.bob_magicfolder = self.init_magicfolder(1, self.bob_upload_dircap, self.bob_collective_dircap, bob_magic_dir)
return result return result
d.addCallback(get_Bob_magicfolder) d.addCallback(get_Bob_magicfolder)
def prepare_result(result): def prepare_result(result):
return self.alice_collective_dircap, self.alice_upload_dircap, self.alice_magicfolder, self.bob_collective_dircap, self.bob_upload_dircap, self.bob_magicfolder return self.alice_collective_dircap, self.alice_upload_dircap, self.alice_magicfolder, self.bob_collective_dircap, self.bob_upload_dircap, self.bob_magicfolder
d.addCallback(prepare_result) d.addCallback(prepare_result)