Finished reworked cli.CLI class into cli.cli plugin

9 files changed, 0 insertions, 170 deletions

diff --git a/tests/test_ipalib/test_cli.py b/tests/test_ipalib/test_cli.py
index 56297fdf7..1763b5610 100644
--- a/tests/test_ipalib/test_cli.py
+++ b/tests/test_ipalib/test_cli.py
@@ -114,164 +114,3 @@ from_default_conf = set in default.conf
 # Make sure cli.conf is loaded first:
 from_cli_conf = overridden in default.conf
 """
-
-
-class test_CLI(ClassChecker):
-    """
-    Test the `ipalib.cli.CLI` class.
-    """
-    _cls = cli.CLI
-
-    def new(self, argv=tuple()):
-        (api, home) = get_api()
-        o = self.cls(api, argv)
-        assert o.api is api
-        return (o, api, home)
-
-    def check_cascade(self, *names):
-        (o, api, home) = self.new()
-        method = getattr(o, names[0])
-        for name in names:
-            assert o.isdone(name) is False
-        method()
-        for name in names:
-            assert o.isdone(name) is True
-        e = raises(StandardError, method)
-        assert str(e) == 'CLI.%s() already called' % names[0]
-
-    def test_init(self):
-        """
-        Test the `ipalib.cli.CLI.__init__` method.
-        """
-        argv = ['-v', 'user-add', '--first=Jonh', '--last=Doe']
-        (o, api, home) = self.new(argv)
-        assert o.api is api
-        assert o.argv == tuple(argv)
-
-    def test_run_real(self):
-        """
-        Test the `ipalib.cli.CLI.run_real` method.
-        """
-        self.check_cascade(
-            'run_real',
-            'finalize',
-            'load_plugins',
-            'bootstrap',
-            'parse_globals'
-        )
-
-    def test_finalize(self):
-        """
-        Test the `ipalib.cli.CLI.finalize` method.
-        """
-        self.check_cascade(
-            'finalize',
-            'load_plugins',
-            'bootstrap',
-            'parse_globals'
-        )
-
-        (o, api, home) = self.new()
-        assert api.isdone('finalize') is False
-        assert 'Command' not in api
-        o.finalize()
-        assert api.isdone('finalize') is True
-        assert list(api.Command) == \
-            sorted(k.__name__ for k in cli.cli_application_commands)
-
-    def test_load_plugins(self):
-        """
-        Test the `ipalib.cli.CLI.load_plugins` method.
-        """
-        self.check_cascade(
-            'load_plugins',
-            'bootstrap',
-            'parse_globals'
-        )
-        (o, api, home) = self.new()
-        assert api.isdone('load_plugins') is False
-        o.load_plugins()
-        assert api.isdone('load_plugins') is True
-
-    def test_bootstrap(self):
-        """
-        Test the `ipalib.cli.CLI.bootstrap` method.
-        """
-        self.check_cascade(
-            'bootstrap',
-            'parse_globals'
-        )
-        # Test with empty argv
-        (o, api, home) = self.new()
-        keys = tuple(api.env)
-        assert api.isdone('bootstrap') is False
-        o.bootstrap()
-        assert api.isdone('bootstrap') is True
-        e = raises(StandardError, o.bootstrap)
-        assert str(e) == 'CLI.bootstrap() already called'
-        assert api.env.verbose is False
-        assert api.env.context == 'cli'
-        keys = tuple(api.env)
-        added = (
-                'my_key',
-                'from_default_conf',
-                'from_cli_conf'
-        )
-        for key in added:
-            assert key not in api.env
-            assert key not in keys
-
-        # Test with a populated argv
-        argv = ['-e', 'my_key=my_val,whatever=Hello']
-        (o, api, home) = self.new(argv)
-        home.write(config_default, '.ipa', 'default.conf')
-        home.write(config_cli, '.ipa', 'cli.conf')
-        o.bootstrap()
-        assert api.env.my_key == 'my_val,whatever=Hello'
-        assert api.env.from_default_conf == 'set in default.conf'
-        assert api.env.from_cli_conf == 'set in cli.conf'
-        assert list(api.env) == sorted(keys + added)
-
-    def test_parse_globals(self):
-        """
-        Test the `ipalib.cli.CLI.parse_globals` method.
-        """
-        # Test with empty argv:
-        (o, api, home) = self.new()
-        assert not hasattr(o, 'options')
-        assert not hasattr(o, 'cmd_argv')
-        assert o.isdone('parse_globals') is False
-        o.parse_globals()
-        assert o.isdone('parse_globals') is True
-        assert o.options.prompt_all is False
-        assert o.options.interactive is True
-        assert o.options.verbose is None
-        assert o.options.conf is None
-        assert o.options.env is None
-        assert o.cmd_argv == tuple()
-        e = raises(StandardError, o.parse_globals)
-        assert str(e) == 'CLI.parse_globals() already called'
-
-        # Test with a populated argv:
-        argv = ('-a', '-n', '-v', '-c', '/my/config.conf', '-e', 'my_key=my_val')
-        cmd_argv = ('user-add', '--first', 'John', '--last', 'Doe')
-        (o, api, home) = self.new(argv + cmd_argv)
-        assert not hasattr(o, 'options')
-        assert not hasattr(o, 'cmd_argv')
-        assert o.isdone('parse_globals') is False
-        o.parse_globals()
-        assert o.isdone('parse_globals') is True
-        assert o.options.prompt_all is True
-        assert o.options.interactive is False
-        assert o.options.verbose is True
-        assert o.options.conf == '/my/config.conf'
-        assert o.options.env == ['my_key=my_val']
-        assert o.cmd_argv == cmd_argv
-        e = raises(StandardError, o.parse_globals)
-        assert str(e) == 'CLI.parse_globals() already called'
-
-        # Test with multiple -e args:
-        argv = ('-e', 'key1=val1', '-e', 'key2=val2')
-        (o, api, home) = self.new(argv)
-        o.parse_globals()
-        assert o.options.env == ['key1=val1', 'key2=val2']
diff --git a/tests/test_xmlrpc/test_automount_plugin.py b/tests/test_xmlrpc/test_automount_plugin.py
index 522ee689a..529e7aead 100644
--- a/tests/test_xmlrpc/test_automount_plugin.py
+++ b/tests/test_xmlrpc/test_automount_plugin.py
@@ -25,7 +25,6 @@ import sys
 from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
-from ipalib.cli import CLI
 
 try:
     api.finalize()
@@ -240,4 +239,3 @@ class test_Indirect(XMLRPC_test):
             pass
         else:
             assert False
-
diff --git a/tests/test_xmlrpc/test_group_plugin.py b/tests/test_xmlrpc/test_group_plugin.py
index 2b16cc8a5..4b9e6bbf1 100644
--- a/tests/test_xmlrpc/test_group_plugin.py
+++ b/tests/test_xmlrpc/test_group_plugin.py
@@ -25,7 +25,6 @@ import sys
 from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
-from ipalib.cli import CLI
 
 try:
     api.finalize()
diff --git a/tests/test_xmlrpc/test_host_plugin.py b/tests/test_xmlrpc/test_host_plugin.py
index 515cd703d..9cd6cf839 100644
--- a/tests/test_xmlrpc/test_host_plugin.py
+++ b/tests/test_xmlrpc/test_host_plugin.py
@@ -25,7 +25,6 @@ import sys
 from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
-from ipalib.cli import CLI
 
 try:
     api.finalize()
diff --git a/tests/test_xmlrpc/test_hostgroup_plugin.py b/tests/test_xmlrpc/test_hostgroup_plugin.py
index 9180c1dd1..ecc61ef72 100644
--- a/tests/test_xmlrpc/test_hostgroup_plugin.py
+++ b/tests/test_xmlrpc/test_hostgroup_plugin.py
@@ -25,7 +25,6 @@ import sys
 from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
-from ipalib.cli import CLI
 
 try:
     api.finalize()
diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/tests/test_xmlrpc/test_netgroup_plugin.py
index 3d3e4afff..54b7eb97f 100644
--- a/tests/test_xmlrpc/test_netgroup_plugin.py
+++ b/tests/test_xmlrpc/test_netgroup_plugin.py
@@ -25,7 +25,6 @@ import sys
 from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
-from ipalib.cli import CLI
 
 try:
     api.finalize()
diff --git a/tests/test_xmlrpc/test_service_plugin.py b/tests/test_xmlrpc/test_service_plugin.py
index 0a843d36e..33dc7b747 100644
--- a/tests/test_xmlrpc/test_service_plugin.py
+++ b/tests/test_xmlrpc/test_service_plugin.py
@@ -25,7 +25,6 @@ import sys
 from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
-from ipalib.cli import CLI
 
 try:
     api.finalize()
diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py
index 0189aa5ac..a89e4d669 100644
--- a/tests/test_xmlrpc/test_user_plugin.py
+++ b/tests/test_xmlrpc/test_user_plugin.py
@@ -25,7 +25,6 @@ import sys
 from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
-from ipalib.cli import CLI
 
 try:
     api.finalize()
diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py
index fd2332d46..74e6157fb 100644
--- a/tests/test_xmlrpc/xmlrpc_test.py
+++ b/tests/test_xmlrpc/xmlrpc_test.py
@@ -26,7 +26,6 @@ import socket
 import nose
 from ipalib import api
 from ipalib import errors
-from ipalib.cli import CLI
 
 try:
     api.finalize()