From: Daira Hopwood Date: Tue, 15 Sep 2015 14:54:35 +0000 (+0100) Subject: Remove MagicFolderCLITestMixin.create_magicfolder. X-Git-Url: https://git.rkrishnan.org/Site/Content/Exhibitors/banana.xhtml?a=commitdiff_plain;h=4c896ec9fe19262f79767839bc73b4884f9a2529;p=tahoe-lafs%2Ftahoe-lafs.git Remove MagicFolderCLITestMixin.create_magicfolder. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/test/test_cli_magic_folder.py b/src/allmydata/test/test_cli_magic_folder.py index 560c7cb3..1a098d03 100644 --- a/src/allmydata/test/test_cli_magic_folder.py +++ b/src/allmydata/test/test_cli_magic_folder.py @@ -108,14 +108,6 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin): magicfolder.ready() return magicfolder - def create_magicfolder(self, client_num=0): - dbfile = abspath_expanduser_unicode(u"private/magicfolderdb.sqlite", base=self.get_clientdir(i=client_num)) - self.collective_dircap, self.upload_dircap = self.get_caps_from_files(client_num) - self.magicfolder = MagicFolder(self.get_client(client_num), self.upload_dircap, self.collective_dircap, self.local_dir, - dbfile, pending_delay=0.2) - self.magicfolder.setServiceParent(self.get_client(client_num)) - return self.magicfolder.ready() - def setup_alice_and_bob(self): self.set_up_grid(num_clients=2) diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index 2df00091..ec801268 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -202,7 +202,7 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual d = defer.succeed(None) d.addCallback(lambda ign: self.create_invite_join_magic_folder(u"Alice", self.local_dir)) - d.addCallback(lambda ign: self.create_magicfolder()) + d.addCallback(self._restart_client) def create_test_file(filename): d2 = self.magicfolder.uploader.set_hook('processed')