summaryrefslogtreecommitdiff
path: root/openstackclient/tests/common/test_commandmanager.py
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2014-06-26 17:23:59 -0500
committerDean Troyer <dtroyer@gmail.com>2014-10-08 18:05:43 -0500
commit5b6c24fdb0154bbbf41f0b05211001d783b69635 (patch)
tree3d46dfe303c2a4669d2ed3615b85ac1f62b16521 /openstackclient/tests/common/test_commandmanager.py
parent0cb204e59b20f25b7a054b411507d6dabbc699ac (diff)
downloadpython-openstackclient-5b6c24fdb0154bbbf41f0b05211001d783b69635.tar.gz
Update for cliff commandmanager >=1.6.1
Cliff 1.6.1 added CommandManager.load_commands() so we can adopt it rather than rolling our own. Also, that second group is Greek, not Latin. Jeez... Change-Id: I4a63c22f37bcfd0ef5d83c2dbd08b58fda0db35c
Diffstat (limited to 'openstackclient/tests/common/test_commandmanager.py')
-rw-r--r--openstackclient/tests/common/test_commandmanager.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/openstackclient/tests/common/test_commandmanager.py b/openstackclient/tests/common/test_commandmanager.py
index 088ea21e..ca9ee9a7 100644
--- a/openstackclient/tests/common/test_commandmanager.py
+++ b/openstackclient/tests/common/test_commandmanager.py
@@ -36,15 +36,15 @@ FAKE_CMD_BETA = FakeCommand
class FakeCommandManager(commandmanager.CommandManager):
commands = {}
- def _load_commands(self, group=None):
- if not group:
+ def load_commands(self, namespace):
+ if namespace == 'test':
self.commands['one'] = FAKE_CMD_ONE
self.commands['two'] = FAKE_CMD_TWO
- self.group_list.append(self.namespace)
- else:
+ self.group_list.append(namespace)
+ elif namespace == 'greek':
self.commands['alpha'] = FAKE_CMD_ALPHA
self.commands['beta'] = FAKE_CMD_BETA
- self.group_list.append(group)
+ self.group_list.append(namespace)
class TestCommandManager(utils.TestCase):
@@ -62,7 +62,7 @@ class TestCommandManager(utils.TestCase):
self.assertEqual(cmd_one, FAKE_CMD_ONE)
# Load another command group
- mgr.add_command_group('latin')
+ mgr.add_command_group('greek')
# Find a new command
cmd_alpha, name, args = mgr.find_command(['alpha'])
@@ -82,7 +82,7 @@ class TestCommandManager(utils.TestCase):
self.assertEqual(cmd_mock, mock_cmd_one)
# Load another command group
- mgr.add_command_group('latin')
+ mgr.add_command_group('greek')
gl = mgr.get_command_groups()
- self.assertEqual(['test', 'latin'], gl)
+ self.assertEqual(['test', 'greek'], gl)