From 6e6a7718470525587d4f470f297293fb33ff85af Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 20 Jul 2015 23:01:44 +0100 Subject: [PATCH] Rename MagicFolderCLITestMixin to MagicFolderTestMixin. Signed-off-by: Daira Hopwood --- src/allmydata/test/test_cli_magic_folder.py | 5 +++-- src/allmydata/test/test_magic_folder.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/allmydata/test/test_cli_magic_folder.py b/src/allmydata/test/test_cli_magic_folder.py index 7b526c95..1cbe9ca6 100644 --- a/src/allmydata/test/test_cli_magic_folder.py +++ b/src/allmydata/test/test_cli_magic_folder.py @@ -13,7 +13,8 @@ from allmydata.util.fileutil import abspath_expanduser_unicode from allmydata.frontends.magic_folder import MagicFolder from allmydata import uri -class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin): + +class MagicFolderTestMixin(CLITestMixin, GridTestMixin): def do_create_magic_folder(self, client_num): d = self.do_cli("magic-folder", "create", "magic:", client_num=client_num) @@ -156,7 +157,7 @@ class MagicFolderCLITestMixin(CLITestMixin, GridTestMixin): return d -class CreateMagicFolder(MagicFolderCLITestMixin, unittest.TestCase): +class CreateMagicFolder(MagicFolderTestMixin, unittest.TestCase): def test_create_and_then_invite_join(self): self.basedir = "cli/MagicFolder/create-and-then-invite-join" diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index d1f2a874..e684970f 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -12,14 +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 MagicFolderCLITestMixin +from allmydata.test.test_cli_magic_folder import MagicFolderTestMixin from allmydata.frontends import magic_folder from allmydata.frontends.magic_folder import MagicFolder from allmydata import backupdb, magicpath from allmydata.util.fileutil import abspath_expanduser_unicode -class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqualMixin, NonASCIIPathMixin): + +class MagicFolderTestMixin(MagicFolderTestMixin, 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