From: David Stainton <dstainton415@gmail.com>
Date: Wed, 15 Jul 2015 22:23:09 +0000 (-0700)
Subject: rename to do_create_magic_folder for tests
X-Git-Url: https://git.rkrishnan.org/htmlfontify-example.html?a=commitdiff_plain;h=d57d30c60f0cb0dd660673dab3daf60c4d0f68bc;p=tahoe-lafs%2Ftahoe-lafs.git

rename to do_create_magic_folder for tests
---

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()