From 24d4634e9d29e10ce248ac036f8da4c44ca6ea05 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Thu, 3 Sep 2015 15:48:48 +0100 Subject: [PATCH] Rename test_cli_magic_folder.MagicFolderTestMixin to MagicFolderCLITestMixin. Signed-off-by: Daira Hopwood --- src/allmydata/test/test_cli_magic_folder.py | 2 +- src/allmydata/test/test_magic_folder.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/allmydata/test/test_cli_magic_folder.py b/src/allmydata/test/test_cli_magic_folder.py index 8c458991..9f7a5570 100644 --- a/src/allmydata/test/test_cli_magic_folder.py +++ b/src/allmydata/test/test_cli_magic_folder.py @@ -14,7 +14,7 @@ from allmydata.frontends.magic_folder import MagicFolder from allmydata import uri -class MagicFolderTestMixin(CLITestMixin, GridTestMixin): +class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin): def do_create_magic_folder(self, client_num): d = self.do_cli("magic-folder", "create", "magic:", client_num=client_num) diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index fdd377dc..9d4d6d73 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -12,16 +12,15 @@ from allmydata.util.consumer import download_to_data from allmydata.test.no_network import GridTestMixin from allmydata.test.common_util import ReallyEqualMixin, NonASCIIPathMixin 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.magic_folder import MagicFolder -from allmydata.frontends.magic_folder import Downloader +from allmydata.frontends.magic_folder import MagicFolder, Downloader from allmydata import backupdb, magicpath 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) with the real INotify. -- 2.45.2