summaryrefslogtreecommitdiff
path: root/openstackclient/tests
diff options
context:
space:
mode:
authorBrandon Palm <bapalm@us.ibm.com>2016-02-17 20:01:23 +0000
committerBrandon Palm <bapalm@us.ibm.com>2016-03-09 16:00:39 +0000
commitf0c3b4e69dc56934305442b505d5f5f68579f1f2 (patch)
treeaeb030048e99ae5559880d1353a3054d756be5ce /openstackclient/tests
parent040d0c2e821a26ebbc72c1ed1a41ec94293bbce4 (diff)
downloadpython-openstackclient-f0c3b4e69dc56934305442b505d5f5f68579f1f2.tar.gz
Fixed command list
The cliff module expects an array of tuples however the array that this function was returning was an array of tuples that was also containing an array of values for the commands attached to each group and the cliff module wasn't liking it. The output now comes out looking like: | openstack.common | limits show | | | extension list | | openstack.baremetal.v1 | baremetal set | Change-Id: Ifa1c149cb5c66ba27dc72bf72d7c8f2f50e42f73 Closes-Bug: 1545609
Diffstat (limited to 'openstackclient/tests')
-rw-r--r--openstackclient/tests/common/test_module.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/openstackclient/tests/common/test_module.py b/openstackclient/tests/common/test_module.py
index 2821da9e..7d08dae7 100644
--- a/openstackclient/tests/common/test_module.py
+++ b/openstackclient/tests/common/test_module.py
@@ -48,10 +48,11 @@ class TestCommandList(utils.TestCommand):
super(TestCommandList, self).setUp()
self.app.command_manager = mock.Mock()
- self.app.command_manager.get_command_groups.return_value = ['test']
+ self.app.command_manager.get_command_groups.return_value = [
+ 'openstack.common'
+ ]
self.app.command_manager.get_command_names.return_value = [
- 'one',
- 'cmd two',
+ 'limits show\nextension list'
]
# Get the command object to test
@@ -67,12 +68,15 @@ class TestCommandList(utils.TestCommand):
# containing the data to be listed.
columns, data = self.cmd.take_action(parsed_args)
+ # TODO(bapalm): Adjust this when cliff properly supports
+ # handling the detection rather than using the hard-code below.
collist = ('Command Group', 'Commands')
self.assertEqual(collist, columns)
datalist = ((
- 'test',
- ['one', 'cmd two'],
- ), )
+ 'openstack.common',
+ 'limits show\nextension list'
+ ),)
+
self.assertEqual(datalist, tuple(data))