f0c3b4e69d
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
131 lines
4.1 KiB
Python
131 lines
4.1 KiB
Python
# Copyright 2013 Nebula Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
"""Test module module"""
|
|
|
|
import mock
|
|
|
|
from openstackclient.common import module as osc_module
|
|
from openstackclient.tests import fakes
|
|
from openstackclient.tests import utils
|
|
|
|
|
|
# NOTE(dtroyer): module_1 must match the version list filter (not --all)
|
|
# currently == '*client*'
|
|
module_name_1 = 'fakeclient'
|
|
module_version_1 = '0.1.2'
|
|
MODULE_1 = {
|
|
'__version__': module_version_1,
|
|
}
|
|
|
|
module_name_2 = 'zlib'
|
|
module_version_2 = '1.1'
|
|
MODULE_2 = {
|
|
'__version__': module_version_2,
|
|
}
|
|
|
|
MODULES = {
|
|
module_name_1: fakes.FakeModule(module_name_1, module_version_1),
|
|
module_name_2: fakes.FakeModule(module_name_2, module_version_2),
|
|
}
|
|
|
|
|
|
class TestCommandList(utils.TestCommand):
|
|
|
|
def setUp(self):
|
|
super(TestCommandList, self).setUp()
|
|
|
|
self.app.command_manager = mock.Mock()
|
|
self.app.command_manager.get_command_groups.return_value = [
|
|
'openstack.common'
|
|
]
|
|
self.app.command_manager.get_command_names.return_value = [
|
|
'limits show\nextension list'
|
|
]
|
|
|
|
# Get the command object to test
|
|
self.cmd = osc_module.ListCommand(self.app, None)
|
|
|
|
def test_command_list_no_options(self):
|
|
arglist = []
|
|
verifylist = []
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# 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 = ((
|
|
'openstack.common',
|
|
'limits show\nextension list'
|
|
),)
|
|
|
|
self.assertEqual(datalist, tuple(data))
|
|
|
|
|
|
@mock.patch.dict(
|
|
'openstackclient.common.module.sys.modules',
|
|
values=MODULES,
|
|
clear=True,
|
|
)
|
|
class TestModuleList(utils.TestCommand):
|
|
|
|
def setUp(self):
|
|
super(TestModuleList, self).setUp()
|
|
|
|
# Get the command object to test
|
|
self.cmd = osc_module.ListModule(self.app, None)
|
|
|
|
def test_module_list_no_options(self):
|
|
arglist = []
|
|
verifylist = [
|
|
('all', False),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Additional modules may be present, just check our additions
|
|
self.assertTrue(module_name_1 in columns)
|
|
self.assertTrue(module_version_1 in data)
|
|
|
|
def test_module_list_all(self):
|
|
arglist = [
|
|
'--all',
|
|
]
|
|
verifylist = [
|
|
('all', True),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Additional modules may be present, just check our additions
|
|
self.assertTrue(module_name_1 in columns)
|
|
self.assertTrue(module_name_2 in columns)
|
|
self.assertTrue(module_version_1 in data)
|
|
self.assertTrue(module_version_2 in data)
|