From 598695010a58e72bc17db4f63e46779535532f82 Mon Sep 17 00:00:00 2001 From: David Stainton Date: Wed, 15 Jul 2015 15:33:33 -0700 Subject: [PATCH] add comments and blank lines to make setup_alice_and_bob more readable --- src/allmydata/test/test_cli_magic_folder.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/allmydata/test/test_cli_magic_folder.py b/src/allmydata/test/test_cli_magic_folder.py index 0c4a991d..5ffe3dfd 100644 --- a/src/allmydata/test/test_cli_magic_folder.py +++ b/src/allmydata/test/test_cli_magic_folder.py @@ -116,6 +116,9 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin): self.mkdir_nonascii(bob_dir) bob_magic_dir = abspath_expanduser_unicode(u"Bob-magic", base=self.basedir) self.mkdir_nonascii(bob_magic_dir) + + # Alice creates a Magic Folder, + # invites herself then and joins. d = self.do_create_magic_folder(0) d.addCallback(lambda x: self.do_invite(0, u"Alice")) 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) return result d.addCallback(get_Alice_magicfolder) + + # Alice invites Bob. Bob joins. d.addCallback(lambda x: self.do_invite(0, u"Bob")) def get_invitecode(result): 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) return result d.addCallback(get_Bob_magicfolder) + 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 d.addCallback(prepare_result) -- 2.45.2