diff options
Diffstat (limited to 'ipalib/tests')
| -rw-r--r-- | ipalib/tests/test_cli.py | 6 | ||||
| -rw-r--r-- | ipalib/tests/test_plugable.py | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/ipalib/tests/test_cli.py b/ipalib/tests/test_cli.py index ad02c645..4c14c0dd 100644 --- a/ipalib/tests/test_cli.py +++ b/ipalib/tests/test_cli.py @@ -22,7 +22,7 @@ Unit tests for `ipalib.cli` module. """ from tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker -from ipalib import cli +from ipalib import cli, plugable def test_to_cli(): @@ -50,7 +50,7 @@ class DummyCmd(object): class DummyAPI(object): def __init__(self, cnt): - self.__cmd = tuple(self.__cmd_iter(cnt)) + self.__cmd = plugable.NameSpace(self.__cmd_iter(cnt)) def __get_cmd(self): return self.__cmd @@ -123,7 +123,7 @@ class test_CLI(ClassChecker): assert len(api.cmd) == cnt o = self.cls(api) o.finalize() - for cmd in api.cmd: + for cmd in api.cmd(): key = cli.to_cli(cmd.name) assert key in o assert o[key] is cmd diff --git a/ipalib/tests/test_plugable.py b/ipalib/tests/test_plugable.py index ba90c203..bf1ef91c 100644 --- a/ipalib/tests/test_plugable.py +++ b/ipalib/tests/test_plugable.py @@ -26,11 +26,11 @@ from tstutil import ClassChecker from ipalib import plugable, errors -def test_valid_identifier(): +def test_check_name(): """ - Test the `valid_identifier` function. + Tests the `check_name` function. """ - f = plugable.check_identifier + f = plugable.check_name okay = [ 'user_add', 'stuff2junk', @@ -426,13 +426,20 @@ class test_NameSpace(ClassChecker): # Test __iter__ i = None - for (i, proxy) in enumerate(ns): + for (i, key) in enumerate(ns): + assert type(key) is str + assert key == get_name(i) + assert i == cnt - 1 + + # Test __call__ + i = None + for (i, proxy) in enumerate(ns()): assert type(proxy) is plugable.Proxy assert proxy.name == get_name(i) assert i == cnt - 1 # Test __contains__, __getitem__, getattr(): - proxies = frozenset(ns) + proxies = frozenset(ns()) for i in xrange(cnt): name = get_name(i) assert name in ns |