test_cli_*: move files into test/cli/*

setup.py

@@ -261,6 +261,7 @@ setup(name=APPNAME,
                 'allmydata.storage',
                 'allmydata.test',
                 'allmydata.test.mutable',
+                'allmydata.test.cli',
                 'allmydata.util',
                 'allmydata.web',
                 'allmydata.windows',

src/allmydata/test/cli/test_backup.py

@@ -12,8 +12,8 @@ from allmydata.util.fileutil import abspath_expanduser_unicode
 from allmydata.util.encodingutil import get_io_encoding, unicode_to_argv
 from allmydata.util.namespace import Namespace
 from allmydata.scripts import cli, backupdb
-from .common_util import StallMixin
-from .no_network import GridTestMixin
+from ..common_util import StallMixin
+from ..no_network import GridTestMixin
 from .test_cli import CLITestMixin, parse_options
 
 timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s

src/allmydata/test/cli/test_check.py

@@ -9,7 +9,7 @@ from allmydata.util.encodingutil import quote_output, to_str
 from allmydata.mutable.publish import MutableData
 from allmydata.immutable import upload
 from allmydata.scripts import debug
-from .no_network import GridTestMixin
+from ..no_network import GridTestMixin
 from .test_cli import CLITestMixin
 
 timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s

src/allmydata/test/cli/test_cli.py

@@ -29,8 +29,8 @@ from allmydata.scripts.common import DEFAULT_ALIAS, get_aliases, get_alias, \
      DefaultAliasMarker
 
 from allmydata.scripts import cli, debug, runner
-from allmydata.test.common_util import ReallyEqualMixin
-from allmydata.test.no_network import GridTestMixin
+from ..common_util import ReallyEqualMixin
+from ..no_network import GridTestMixin
 from twisted.internet import threads # CLI tests use deferToThread
 from twisted.python import usage
 

src/allmydata/test/cli/test_cp.py

@@ -8,7 +8,7 @@ from allmydata.util import fileutil
 from allmydata.util.encodingutil import (quote_output, get_io_encoding,
                                          unicode_to_output, to_str)
 from allmydata.util.assertutil import _assert
-from .no_network import GridTestMixin
+from ..no_network import GridTestMixin
 from .test_cli import CLITestMixin
 
 timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s

src/allmydata/test/cli/test_create_alias.py

@@ -4,7 +4,7 @@ import urllib
 from allmydata.util import fileutil
 from allmydata.scripts.common import get_aliases
 from allmydata.scripts import cli, runner
-from allmydata.test.no_network import GridTestMixin
+from ..no_network import GridTestMixin
 from allmydata.util.encodingutil import quote_output, get_io_encoding
 from .test_cli import CLITestMixin
 

src/allmydata/test/cli/test_list.py

@@ -4,7 +4,7 @@ from twisted.internet import defer
 from allmydata.immutable import upload
 from allmydata.interfaces import MDMF_VERSION, SDMF_VERSION
 from allmydata.mutable.publish import MutableData
-from allmydata.test.no_network import GridTestMixin
+from ..no_network import GridTestMixin
 from allmydata.util.encodingutil import quote_output, get_io_encoding
 from .test_cli import CLITestMixin
 

src/allmydata/test/cli/test_magic_folder.py

@@ -9,7 +9,7 @@ from twisted.python import usage
 from allmydata.util.assertutil import precondition
 from allmydata.util import fileutil
 from allmydata.scripts.common import get_aliases
-from allmydata.test.no_network import GridTestMixin
+from ..no_network import GridTestMixin
 from .test_cli import CLITestMixin
 from allmydata.scripts import magic_folder_cli
 from allmydata.util.fileutil import abspath_expanduser_unicode

src/allmydata/test/cli/test_mv.py

@@ -1,7 +1,7 @@
 import os.path
 from twisted.trial import unittest
 from allmydata.util import fileutil
-from allmydata.test.no_network import GridTestMixin
+from ..no_network import GridTestMixin
 from allmydata.scripts import tahoe_mv
 from .test_cli import CLITestMixin
 

src/allmydata/test/cli/test_put.py

@@ -5,7 +5,7 @@ from twisted.python import usage
 from allmydata.util import fileutil
 from allmydata.scripts.common import get_aliases
 from allmydata.scripts import cli
-from allmydata.test.no_network import GridTestMixin
+from ..no_network import GridTestMixin
 from allmydata.util.encodingutil import get_io_encoding, unicode_to_argv
 from allmydata.util.fileutil import abspath_expanduser_unicode
 from .test_cli import CLITestMixin

src/allmydata/test/test_configutil.py

@@ -4,7 +4,7 @@ from twisted.trial import unittest
 
 from allmydata.util import configutil
 from allmydata.test.no_network import GridTestMixin
-from .test_cli import CLITestMixin
+from .cli.test_cli import CLITestMixin
 
 
 class ConfigUtilTests(CLITestMixin, GridTestMixin, unittest.TestCase):

src/allmydata/test/test_magic_folder.py

@@ -18,7 +18,7 @@ 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 .test_cli_magic_folder import MagicFolderCLITestMixin
+from .cli.test_magic_folder import MagicFolderCLITestMixin
 
 from allmydata.frontends import magic_folder
 from allmydata.frontends.magic_folder import MagicFolder, WriteFileMixin