Re: [Freeipa-devel] [PATCH] 0021 Add CLI tests
On Wed, 2012-03-28 at 10:19 +0200, Petr Viktorin wrote: > On 03/28/2012 09:11 AM, Martin Kosek wrote: > > On Tue, 2012-03-27 at 19:02 +0200, Petr Viktorin wrote: > >> Updated with a regression test for > >> https://fedorahosted.org/freeipa/ticket/2581 (Unable to delete all sshfp > >> records interactively) which Martin fixed recently. > >> > >> > > > > Thank's for adding a specific test for this I see 2 issues with this > > patch: > > > > 1) DNS tests are not skipped when DNS is not configured: > > > > $ ./make-test tests/test_cmdline/test_cli.py > > test_cli.TestCLIParsing.test_dnsrecord_add ... ok > > test_cli.TestCLIParsing.test_dnsrecord_del_all ... ERROR > > test_cli.TestCLIParsing.test_dnsrecord_del_one_by_one ... ERROR > > test_cli.TestCLIParsing.test_group_add ... ok > > ... > > > > We should rather skip these test as we do in test_dns_plugin.py instead > > of failing with ERROR. > > Good point, I added this. > > > 2) pprint is not needed, its output is not shown anyway as stdout is > > captured: > > +import pprint > > ... > > +pprint.pprint(kw_got) > > It is shown when the test fails; I found it quite useful when adding new > tests. But you're right, it is not needed. Removed. > > ACK. Pushed to master, ipa-2-2. Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] 0021 Add CLI tests
On 03/28/2012 09:11 AM, Martin Kosek wrote:
On Tue, 2012-03-27 at 19:02 +0200, Petr Viktorin wrote:
Updated with a regression test for
https://fedorahosted.org/freeipa/ticket/2581 (Unable to delete all sshfp
records interactively) which Martin fixed recently.
Thank's for adding a specific test for this I see 2 issues with this
patch:
1) DNS tests are not skipped when DNS is not configured:
$ ./make-test tests/test_cmdline/test_cli.py
test_cli.TestCLIParsing.test_dnsrecord_add ... ok
test_cli.TestCLIParsing.test_dnsrecord_del_all ... ERROR
test_cli.TestCLIParsing.test_dnsrecord_del_one_by_one ... ERROR
test_cli.TestCLIParsing.test_group_add ... ok
...
We should rather skip these test as we do in test_dns_plugin.py instead
of failing with ERROR.
Good point, I added this.
2) pprint is not needed, its output is not shown anyway as stdout is
captured:
+import pprint
...
+pprint.pprint(kw_got)
It is shown when the test fails; I found it quite useful when adding new
tests. But you're right, it is not needed. Removed.
--
Petr³
From 0ac65abe30dc6dcd2a4c2fa36766cf312521d7aa Mon Sep 17 00:00:00 2001
From: Petr Viktorin
Date: Tue, 13 Mar 2012 07:10:52 -0400
Subject: [PATCH] Add CLI parsing tests
These test that command lines are parsed to correct Command arguments.
Includes some tests for interactive prompts.
To make this possible cli.run is broken up into several pieces.
---
ipalib/__init__.py |3 +
ipalib/backend.py |1 -
ipalib/cli.py | 24 +-
tests/test_cmdline/test_cli.py | 184
4 files changed, 207 insertions(+), 5 deletions(-)
create mode 100644 tests/test_cmdline/test_cli.py
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index 1efeeab4a6c5cef8f625c3964be253baf208dd29..dd861a8266614d63a81289672ce2235275c356c0 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -916,5 +916,8 @@ def create_api(mode='dummy'):
api = create_api(mode=None)
if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test':
+from cli import cli_plugins
+for klass in cli_plugins:
+api.register(klass)
api.bootstrap(context='cli', in_server=False, in_tree=True)
api.finalize()
diff --git a/ipalib/backend.py b/ipalib/backend.py
index 0232fa536ed83273d1c6510ee442915bb8c0c8c1..7be38ecc80faf03e735813fb1e2d0eba5c347800 100644
--- a/ipalib/backend.py
+++ b/ipalib/backend.py
@@ -102,7 +102,6 @@ def __get_conn(self):
class Executioner(Backend):
-
def create_context(self, ccache=None, client_ip=None):
"""
client_ip: The IP address of the remote client.
diff --git a/ipalib/cli.py b/ipalib/cli.py
index ea320cf652e309592f9906831e3de2d0beb10198..5e58cc47d5e5d61a76bc917268f0e63307228efa 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -123,7 +123,7 @@ def max_col_width(self, rows, col=None):
def __get_encoding(self, stream):
assert stream in (sys.stdin, sys.stdout)
-if stream.encoding is None:
+if getattr(stream, 'encoding', None) is None:
return 'UTF-8'
return stream.encoding
@@ -1007,7 +1007,11 @@ class cli(backend.Executioner):
Backend plugin for executing from command line interface.
"""
-def run(self, argv):
+def get_command(self, argv):
+"""Given CLI arguments, return the Command to use
+
+On incorrect invocation, prints out a help message and returns None
+"""
if len(argv) == 0:
self.Command.help()
return
@@ -1022,15 +1026,27 @@ def run(self, argv):
if name not in self.Command or self.Command[name].NO_CLI:
raise CommandError(name=key)
cmd = self.Command[name]
-if not isinstance(cmd, frontend.Local):
-self.create_context()
+return cmd
+
+def argv_to_keyword_arguments(self, cmd, argv):
+"""Get the keyword arguments for a Command"""
kw = self.parse(cmd, argv)
if self.env.interactive:
self.prompt_interactively(cmd, kw)
kw = cmd.split_csv(**kw)
kw['version'] = API_VERSION
self.load_files(cmd, kw)
+return kw
+
+def run(self, argv):
+cmd = self.get_command(argv)
+if cmd is None:
+return
+name = cmd.name
+if not isinstance(cmd, frontend.Local):
+self.create_context()
try:
+kw = self.argv_to_keyword_arguments(cmd, argv[1:])
result = self.execute(name, **kw)
if callable(cmd.output_for_cli):
for param in cmd.params():
diff --git a/tests/test_cmdline/test_cli.py b/tests/test_cmdline/test_cli.py
new file mode 100644
index ..889aae4130cba4d728b1b461719767f2db9a73cb
--- /dev/null
+++ b/tests/test_cmdline/test_cli.py
@@ -0,0 +1,184 @@
+import shlex
+import sys
+import contextlib
+import StringIO
+
+import nose
+
+from tests import util
+fr
Re: [Freeipa-devel] [PATCH] 0021 Add CLI tests
On Tue, 2012-03-27 at 19:02 +0200, Petr Viktorin wrote: > Updated with a regression test for > https://fedorahosted.org/freeipa/ticket/2581 (Unable to delete all sshfp > records interactively) which Martin fixed recently. > > Thank's for adding a specific test for this I see 2 issues with this patch: 1) DNS tests are not skipped when DNS is not configured: $ ./make-test tests/test_cmdline/test_cli.py test_cli.TestCLIParsing.test_dnsrecord_add ... ok test_cli.TestCLIParsing.test_dnsrecord_del_all ... ERROR test_cli.TestCLIParsing.test_dnsrecord_del_one_by_one ... ERROR test_cli.TestCLIParsing.test_group_add ... ok ... We should rather skip these test as we do in test_dns_plugin.py instead of failing with ERROR. 2) pprint is not needed, its output is not shown anyway as stdout is captured: +import pprint ... +pprint.pprint(kw_got) Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] 0021 Add CLI tests
Updated with a regression test for
https://fedorahosted.org/freeipa/ticket/2581 (Unable to delete all sshfp
records interactively) which Martin fixed recently.
--
Petr³
From 585423feb041cd434977130bd6f00975808ccf30 Mon Sep 17 00:00:00 2001
From: Petr Viktorin
Date: Tue, 13 Mar 2012 07:10:52 -0400
Subject: [PATCH] Add CLI parsing tests
These test that command lines are parsed to correct Command arguments.
Includes some tests for interactive prompts.
To make this possible cli.run is broken up into several pieces.
---
ipalib/__init__.py |3 +
ipalib/backend.py |1 -
ipalib/cli.py | 24 +-
tests/test_cmdline/test_cli.py | 178
4 files changed, 201 insertions(+), 5 deletions(-)
create mode 100644 tests/test_cmdline/test_cli.py
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index 1efeeab4a6c5cef8f625c3964be253baf208dd29..dd861a8266614d63a81289672ce2235275c356c0 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -916,5 +916,8 @@ def create_api(mode='dummy'):
api = create_api(mode=None)
if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test':
+from cli import cli_plugins
+for klass in cli_plugins:
+api.register(klass)
api.bootstrap(context='cli', in_server=False, in_tree=True)
api.finalize()
diff --git a/ipalib/backend.py b/ipalib/backend.py
index 0232fa536ed83273d1c6510ee442915bb8c0c8c1..7be38ecc80faf03e735813fb1e2d0eba5c347800 100644
--- a/ipalib/backend.py
+++ b/ipalib/backend.py
@@ -102,7 +102,6 @@ def __get_conn(self):
class Executioner(Backend):
-
def create_context(self, ccache=None, client_ip=None):
"""
client_ip: The IP address of the remote client.
diff --git a/ipalib/cli.py b/ipalib/cli.py
index ea320cf652e309592f9906831e3de2d0beb10198..5e58cc47d5e5d61a76bc917268f0e63307228efa 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -123,7 +123,7 @@ def max_col_width(self, rows, col=None):
def __get_encoding(self, stream):
assert stream in (sys.stdin, sys.stdout)
-if stream.encoding is None:
+if getattr(stream, 'encoding', None) is None:
return 'UTF-8'
return stream.encoding
@@ -1007,7 +1007,11 @@ class cli(backend.Executioner):
Backend plugin for executing from command line interface.
"""
-def run(self, argv):
+def get_command(self, argv):
+"""Given CLI arguments, return the Command to use
+
+On incorrect invocation, prints out a help message and returns None
+"""
if len(argv) == 0:
self.Command.help()
return
@@ -1022,15 +1026,27 @@ def run(self, argv):
if name not in self.Command or self.Command[name].NO_CLI:
raise CommandError(name=key)
cmd = self.Command[name]
-if not isinstance(cmd, frontend.Local):
-self.create_context()
+return cmd
+
+def argv_to_keyword_arguments(self, cmd, argv):
+"""Get the keyword arguments for a Command"""
kw = self.parse(cmd, argv)
if self.env.interactive:
self.prompt_interactively(cmd, kw)
kw = cmd.split_csv(**kw)
kw['version'] = API_VERSION
self.load_files(cmd, kw)
+return kw
+
+def run(self, argv):
+cmd = self.get_command(argv)
+if cmd is None:
+return
+name = cmd.name
+if not isinstance(cmd, frontend.Local):
+self.create_context()
try:
+kw = self.argv_to_keyword_arguments(cmd, argv[1:])
result = self.execute(name, **kw)
if callable(cmd.output_for_cli):
for param in cmd.params():
diff --git a/tests/test_cmdline/test_cli.py b/tests/test_cmdline/test_cli.py
new file mode 100644
index ..b4c55b59fe3d26593cdb546ea4bf9d6a86bf7e85
--- /dev/null
+++ b/tests/test_cmdline/test_cli.py
@@ -0,0 +1,178 @@
+import pprint
+import shlex
+import sys
+import contextlib
+import StringIO
+
+from tests import util
+from ipalib import api
+from ipapython.version import API_VERSION
+
+
+class TestCLIParsing(object):
+"""Tests that commandlines are correctly parsed to Command keyword args
+"""
+def check_command(self, commandline, expected_command_name, **kw_expected):
+argv = shlex.split(commandline)
+executioner = api.Backend.cli
+
+cmd = executioner.get_command(argv)
+kw_got = executioner.argv_to_keyword_arguments(cmd, argv[1:])
+pprint.pprint(kw_got)
+util.assert_deepequal(expected_command_name, cmd.name, 'Command name')
+util.assert_deepequal(kw_expected, kw_got)
+
+def run_command(self, command_name, **kw):
+"""Run a command on the server"""
+if not api.Backend.xmlclient.isconnected():
+api.Backend.xmlclient.connect(fallback=False)
+api.Command[command_name](**kw)
+
+@contex
Re: [Freeipa-devel] [PATCH] 0021 Add CLI tests
On 03/16/2012 01:02 PM, Petr Viktorin wrote:
On 03/13/2012 12:23 PM, Petr Viktorin wrote:
On 03/12/2012 09:18 PM, Rob Crittenden wrote:
Petr Viktorin wrote:
Most of the tests we have check if the server does the right thing with
XML-RPC calls. How the commandline is converted to command arguments,
including interactive prompting, is untested.
This patch adds some tests in this area. To do that I had to break up
cli.run into more manageable pieces, and initialize the CLI plugins in
test mode.
Also I added nose's --nocapture option to the make-test script. With
this it's possible to use pdb.set_trace() to drop into a debugger while
running the tests.
I went ahead and added a test for ticket 2484, fixed in Martin's patch
231 (Ignore case in yes/no prompts).
John had done similar work with --nocapture a while back but it is still
pending. Perhaps we can merge his changes in with yours, they look
largely overlapping. His patch is [PATCH 54/54] ticet 2135 - enhance
make-test for debugging
rob
I guess it'll be better to make that a separate patch, then. This
updated patch doesn't contain the make-test change.
Updating the patch to also test the CSV splitting in my patch 0015.04
Update for quoting only, no backslashes, in CSV -- following Rob's
suggestion on the CSV patch.
--
Petr³
From 96d4951afa6e22be0687ad4a53c2a01dc12dddcc Mon Sep 17 00:00:00 2001
From: Petr Viktorin
Date: Tue, 13 Mar 2012 07:10:52 -0400
Subject: [PATCH 16/16] Add CLI parsing tests
These test that command lines are parsed to correct Command arguments.
Includes some tests for interactive prompts.
To make this possible cli.run is broken up into several pieces.
---
ipalib/__init__.py |3 +
ipalib/backend.py |1 -
ipalib/cli.py | 24 +-
tests/test_cmdline/test_cli.py | 153
4 files changed, 176 insertions(+), 5 deletions(-)
create mode 100644 tests/test_cmdline/test_cli.py
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index 1efeeab4a6c5cef8f625c3964be253baf208dd29..dd861a8266614d63a81289672ce2235275c356c0 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -916,5 +916,8 @@ def create_api(mode='dummy'):
api = create_api(mode=None)
if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test':
+from cli import cli_plugins
+for klass in cli_plugins:
+api.register(klass)
api.bootstrap(context='cli', in_server=False, in_tree=True)
api.finalize()
diff --git a/ipalib/backend.py b/ipalib/backend.py
index 0232fa536ed83273d1c6510ee442915bb8c0c8c1..7be38ecc80faf03e735813fb1e2d0eba5c347800 100644
--- a/ipalib/backend.py
+++ b/ipalib/backend.py
@@ -102,7 +102,6 @@ class Connectible(Backend):
class Executioner(Backend):
-
def create_context(self, ccache=None, client_ip=None):
"""
client_ip: The IP address of the remote client.
diff --git a/ipalib/cli.py b/ipalib/cli.py
index ea320cf652e309592f9906831e3de2d0beb10198..5e58cc47d5e5d61a76bc917268f0e63307228efa 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -123,7 +123,7 @@ class textui(backend.Backend):
def __get_encoding(self, stream):
assert stream in (sys.stdin, sys.stdout)
-if stream.encoding is None:
+if getattr(stream, 'encoding', None) is None:
return 'UTF-8'
return stream.encoding
@@ -1007,7 +1007,11 @@ class cli(backend.Executioner):
Backend plugin for executing from command line interface.
"""
-def run(self, argv):
+def get_command(self, argv):
+"""Given CLI arguments, return the Command to use
+
+On incorrect invocation, prints out a help message and returns None
+"""
if len(argv) == 0:
self.Command.help()
return
@@ -1022,15 +1026,27 @@ class cli(backend.Executioner):
if name not in self.Command or self.Command[name].NO_CLI:
raise CommandError(name=key)
cmd = self.Command[name]
-if not isinstance(cmd, frontend.Local):
-self.create_context()
+return cmd
+
+def argv_to_keyword_arguments(self, cmd, argv):
+"""Get the keyword arguments for a Command"""
kw = self.parse(cmd, argv)
if self.env.interactive:
self.prompt_interactively(cmd, kw)
kw = cmd.split_csv(**kw)
kw['version'] = API_VERSION
self.load_files(cmd, kw)
+return kw
+
+def run(self, argv):
+cmd = self.get_command(argv)
+if cmd is None:
+return
+name = cmd.name
+if not isinstance(cmd, frontend.Local):
+self.create_context()
try:
+kw = self.argv_to_keyword_arguments(cmd, argv[1:])
result = self.execute(name, **kw)
if callable(cmd.output_for_cli):
for param in cmd.params():
diff --git a/tests/test_cmdline/test_cli.py b/tests/test_cmdline/test_cli.py
new file mode
Re: [Freeipa-devel] [PATCH] 0021 Add CLI tests
On 03/13/2012 12:23 PM, Petr Viktorin wrote:
On 03/12/2012 09:18 PM, Rob Crittenden wrote:
Petr Viktorin wrote:
Most of the tests we have check if the server does the right thing with
XML-RPC calls. How the commandline is converted to command arguments,
including interactive prompting, is untested.
This patch adds some tests in this area. To do that I had to break up
cli.run into more manageable pieces, and initialize the CLI plugins in
test mode.
Also I added nose's --nocapture option to the make-test script. With
this it's possible to use pdb.set_trace() to drop into a debugger while
running the tests.
I went ahead and added a test for ticket 2484, fixed in Martin's patch
231 (Ignore case in yes/no prompts).
John had done similar work with --nocapture a while back but it is still
pending. Perhaps we can merge his changes in with yours, they look
largely overlapping. His patch is [PATCH 54/54] ticet 2135 - enhance
make-test for debugging
rob
I guess it'll be better to make that a separate patch, then. This
updated patch doesn't contain the make-test change.
Updating the patch to also test the CSV splitting in my patch 0015.04
--
Petr³
From 00d584e01336ea8b86f476c8904c3ac1a1dd6855 Mon Sep 17 00:00:00 2001
From: Petr Viktorin
Date: Tue, 13 Mar 2012 07:10:52 -0400
Subject: [PATCH] Add CLI parsing tests
These test that command lines are parsed to correct Command arguments.
Includes some tests for interactive prompts.
To make this possible cli.run is broken up into several pieces.
---
ipalib/__init__.py |3 +
ipalib/backend.py |1 -
ipalib/cli.py | 24 +-
tests/test_cmdline/test_cli.py | 153
4 files changed, 176 insertions(+), 5 deletions(-)
create mode 100644 tests/test_cmdline/test_cli.py
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index 1efeeab4a6c5cef8f625c3964be253baf208dd29..dd861a8266614d63a81289672ce2235275c356c0 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -916,5 +916,8 @@ def create_api(mode='dummy'):
api = create_api(mode=None)
if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test':
+from cli import cli_plugins
+for klass in cli_plugins:
+api.register(klass)
api.bootstrap(context='cli', in_server=False, in_tree=True)
api.finalize()
diff --git a/ipalib/backend.py b/ipalib/backend.py
index 0232fa536ed83273d1c6510ee442915bb8c0c8c1..7be38ecc80faf03e735813fb1e2d0eba5c347800 100644
--- a/ipalib/backend.py
+++ b/ipalib/backend.py
@@ -102,7 +102,6 @@ class Connectible(Backend):
class Executioner(Backend):
-
def create_context(self, ccache=None, client_ip=None):
"""
client_ip: The IP address of the remote client.
diff --git a/ipalib/cli.py b/ipalib/cli.py
index ea320cf652e309592f9906831e3de2d0beb10198..5e58cc47d5e5d61a76bc917268f0e63307228efa 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -123,7 +123,7 @@ class textui(backend.Backend):
def __get_encoding(self, stream):
assert stream in (sys.stdin, sys.stdout)
-if stream.encoding is None:
+if getattr(stream, 'encoding', None) is None:
return 'UTF-8'
return stream.encoding
@@ -1007,7 +1007,11 @@ class cli(backend.Executioner):
Backend plugin for executing from command line interface.
"""
-def run(self, argv):
+def get_command(self, argv):
+"""Given CLI arguments, return the Command to use
+
+On incorrect invocation, prints out a help message and returns None
+"""
if len(argv) == 0:
self.Command.help()
return
@@ -1022,15 +1026,27 @@ class cli(backend.Executioner):
if name not in self.Command or self.Command[name].NO_CLI:
raise CommandError(name=key)
cmd = self.Command[name]
-if not isinstance(cmd, frontend.Local):
-self.create_context()
+return cmd
+
+def argv_to_keyword_arguments(self, cmd, argv):
+"""Get the keyword arguments for a Command"""
kw = self.parse(cmd, argv)
if self.env.interactive:
self.prompt_interactively(cmd, kw)
kw = cmd.split_csv(**kw)
kw['version'] = API_VERSION
self.load_files(cmd, kw)
+return kw
+
+def run(self, argv):
+cmd = self.get_command(argv)
+if cmd is None:
+return
+name = cmd.name
+if not isinstance(cmd, frontend.Local):
+self.create_context()
try:
+kw = self.argv_to_keyword_arguments(cmd, argv[1:])
result = self.execute(name, **kw)
if callable(cmd.output_for_cli):
for param in cmd.params():
diff --git a/tests/test_cmdline/test_cli.py b/tests/test_cmdline/test_cli.py
new file mode 100644
index ..324c82563dd0bdcc86234097da7fd03efda00305
--- /dev/null
+++ b/tests/test_cmdline/test_cli.py
@@ -0,0
Re: [Freeipa-devel] [PATCH] 0021 Add CLI tests
On 03/12/2012 09:18 PM, Rob Crittenden wrote:
Petr Viktorin wrote:
Most of the tests we have check if the server does the right thing with
XML-RPC calls. How the commandline is converted to command arguments,
including interactive prompting, is untested.
This patch adds some tests in this area. To do that I had to break up
cli.run into more manageable pieces, and initialize the CLI plugins in
test mode.
Also I added nose's --nocapture option to the make-test script. With
this it's possible to use pdb.set_trace() to drop into a debugger while
running the tests.
I went ahead and added a test for ticket 2484, fixed in Martin's patch
231 (Ignore case in yes/no prompts).
John had done similar work with --nocapture a while back but it is still
pending. Perhaps we can merge his changes in with yours, they look
largely overlapping. His patch is [PATCH 54/54] ticet 2135 - enhance
make-test for debugging
rob
I guess it'll be better to make that a separate patch, then. This
updated patch doesn't contain the make-test change.
--
Petr³
From b86cdff3d1d2d149077178221401bf7e62856982 Mon Sep 17 00:00:00 2001
From: Petr Viktorin
Date: Tue, 13 Mar 2012 07:10:52 -0400
Subject: [PATCH] Add CLI parsing tests
These test that command lines are parsed to correct Command arguments.
Includes some tests for interactive prompts.
To make this possible cli.run is broken up into several pieces.
---
ipalib/__init__.py |3 +
ipalib/backend.py |1 -
ipalib/cli.py | 24 ++-
tests/test_cmdline/test_cli.py | 141
4 files changed, 164 insertions(+), 5 deletions(-)
create mode 100644 tests/test_cmdline/test_cli.py
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index 1efeeab4a6c5cef8f625c3964be253baf208dd29..dd861a8266614d63a81289672ce2235275c356c0 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -916,5 +916,8 @@ def create_api(mode='dummy'):
api = create_api(mode=None)
if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test':
+from cli import cli_plugins
+for klass in cli_plugins:
+api.register(klass)
api.bootstrap(context='cli', in_server=False, in_tree=True)
api.finalize()
diff --git a/ipalib/backend.py b/ipalib/backend.py
index 0232fa536ed83273d1c6510ee442915bb8c0c8c1..7be38ecc80faf03e735813fb1e2d0eba5c347800 100644
--- a/ipalib/backend.py
+++ b/ipalib/backend.py
@@ -102,7 +102,6 @@ class Connectible(Backend):
class Executioner(Backend):
-
def create_context(self, ccache=None, client_ip=None):
"""
client_ip: The IP address of the remote client.
diff --git a/ipalib/cli.py b/ipalib/cli.py
index 7af63761a361af432015d49c88bdb85d0042c1e8..7e7950a845a2b70ffd006a03cf46782faec7 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -123,7 +123,7 @@ class textui(backend.Backend):
def __get_encoding(self, stream):
assert stream in (sys.stdin, sys.stdout)
-if stream.encoding is None:
+if getattr(stream, 'encoding', None) is None:
return 'UTF-8'
return stream.encoding
@@ -1007,7 +1007,11 @@ class cli(backend.Executioner):
Backend plugin for executing from command line interface.
"""
-def run(self, argv):
+def get_command(self, argv):
+"""Given CLI arguments, return the Command to use
+
+On incorrect invocation, prints out a help message and returns None
+"""
if len(argv) == 0:
self.Command.help()
return
@@ -1022,14 +1026,26 @@ class cli(backend.Executioner):
if name not in self.Command or self.Command[name].NO_CLI:
raise CommandError(name=key)
cmd = self.Command[name]
-if not isinstance(cmd, frontend.Local):
-self.create_context()
+return cmd
+
+def argv_to_keyword_arguments(self, cmd, argv):
+"""Get the keyword arguments for a Command"""
kw = self.parse(cmd, argv)
kw['version'] = API_VERSION
if self.env.interactive:
self.prompt_interactively(cmd, kw)
self.load_files(cmd, kw)
+return kw
+
+def run(self, argv):
+cmd = self.get_command(argv)
+if cmd is None:
+return
+name = cmd.name
+if not isinstance(cmd, frontend.Local):
+self.create_context()
try:
+kw = self.argv_to_keyword_arguments(cmd, argv[1:])
result = self.execute(name, **kw)
if callable(cmd.output_for_cli):
for param in cmd.params():
diff --git a/tests/test_cmdline/test_cli.py b/tests/test_cmdline/test_cli.py
new file mode 100644
index ..06daea1fa6b072040a06a3030f17134dbc6cab7c
--- /dev/null
+++ b/tests/test_cmdline/test_cli.py
@@ -0,0 +1,141 @@
+import pprint
+import shlex
+import sys
+import contextlib
+import StringIO
+
+from tests import util
+from ipalib import api
+from ipapytho
Re: [Freeipa-devel] [PATCH] 0021 Add CLI tests
Petr Viktorin wrote: Most of the tests we have check if the server does the right thing with XML-RPC calls. How the commandline is converted to command arguments, including interactive prompting, is untested. This patch adds some tests in this area. To do that I had to break up cli.run into more manageable pieces, and initialize the CLI plugins in test mode. Also I added nose's --nocapture option to the make-test script. With this it's possible to use pdb.set_trace() to drop into a debugger while running the tests. I went ahead and added a test for ticket 2484, fixed in Martin's patch 231 (Ignore case in yes/no prompts). John had done similar work with --nocapture a while back but it is still pending. Perhaps we can merge his changes in with yours, they look largely overlapping. His patch is [PATCH 54/54] ticet 2135 - enhance make-test for debugging rob ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
