From a77d14cef7e2293310d0894b1122289c1ddecdab Mon Sep 17 00:00:00 2001 From: David Stainton Date: Wed, 15 Jul 2015 15:23:09 -0700 Subject: [PATCH] rename to do_create_magic_folder for tests --- src/allmydata/test/test_cli_magic_folder.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/allmydata/test/test_cli_magic_folder.py b/src/allmydata/test/test_cli_magic_folder.py index d5b4839a..64fb9227 100644 --- a/src/allmydata/test/test_cli_magic_folder.py +++ b/src/allmydata/test/test_cli_magic_folder.py @@ -16,7 +16,7 @@ from allmydata import uri class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin): - def create_magic_folder(self, client_num): + def do_create_magic_folder(self, client_num): d = self.do_cli("magic-folder", "create", "magic:", client_num=client_num) def _done((rc,stdout,stderr)): self.failUnless(rc == 0) @@ -116,7 +116,7 @@ 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) - d = self.create_magic_folder(0) + d = self.do_create_magic_folder(0) d.addCallback(lambda x: self.invite(0, u"Alice")) def get_invitecode(result): self.invitecode = result[1].strip() @@ -157,7 +157,7 @@ class CreateMagicFolder(MagicFolderCLITestMixin, unittest.TestCase): self.basedir = "cli/MagicFolder/create-and-then-invite-join" self.set_up_grid() self.local_dir = os.path.join(self.basedir, "magic") - d = self.create_magic_folder(0) + d = self.do_create_magic_folder(0) d.addCallback(lambda x: self.invite(0, u"Alice")) def get_invite((rc,stdout,stderr)): self.invite_code = stdout.strip() -- 2.45.2