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

Rename test_cli_magic_folder.MagicFolderTestMixin to MagicFolderCLITestMixin.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-09-03 15:48:48 +01:00
parent c8f5c690ba
commit a3c4364d7b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ from allmydata.frontends.magic_folder import MagicFolder
from allmydata import uri from allmydata import uri
class MagicFolderTestMixin(CLITestMixin, GridTestMixin): class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin):
def do_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) d = self.do_cli("magic-folder", "create", "magic:", client_num=client_num)
@ -157,7 +157,7 @@ class MagicFolderTestMixin(CLITestMixin, GridTestMixin):
return d return d
class CreateMagicFolder(MagicFolderTestMixin, unittest.TestCase): class CreateMagicFolder(MagicFolderCLITestMixin, unittest.TestCase):
def test_create_and_then_invite_join(self): def test_create_and_then_invite_join(self):
self.basedir = "cli/MagicFolder/create-and-then-invite-join" self.basedir = "cli/MagicFolder/create-and-then-invite-join"

7
src/allmydata/test/test_magic_folder.py
View File

@ -12,16 +12,15 @@ from allmydata.util.consumer import download_to_data
from allmydata.test.no_network import GridTestMixin from allmydata.test.no_network import GridTestMixin
from allmydata.test.common_util import ReallyEqualMixin, NonASCIIPathMixin from allmydata.test.common_util import ReallyEqualMixin, NonASCIIPathMixin
from allmydata.test.common import ShouldFailMixin from allmydata.test.common import ShouldFailMixin
from allmydata.test.test_cli_magic_folder import MagicFolderTestMixin from .test_cli_magic_folder import MagicFolderCLITestMixin
from allmydata.frontends import magic_folder from allmydata.frontends import magic_folder
from allmydata.frontends.magic_folder import MagicFolder from allmydata.frontends.magic_folder import MagicFolder, Downloader
from allmydata.frontends.magic_folder import Downloader
from allmydata import backupdb, magicpath from allmydata import backupdb, magicpath
from allmydata.util.fileutil import abspath_expanduser_unicode from allmydata.util.fileutil import abspath_expanduser_unicode
class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMixin, NonASCIIPathMixin): class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqualMixin, NonASCIIPathMixin):
""" """
These tests will be run both with a mock notifier, and (on platforms that support it) These tests will be run both with a mock notifier, and (on platforms that support it)
with the real INotify. with the real INotify.