openstack/python-openstackclient
Code Issues Proposed changes

Merge "Remove testing of cliff command line options"

Browse Source
This commit is contained in:
Jenkins 2015-07-12 14:58:32 +00:00 committed by Gerrit Code Review
commit fac52cc606
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openstackclient/tests/network/common.py
View File

@ -33,30 +33,3 @@ class TestNetworkBase(utils.TestCommand):
service_type="network",
)
self.api = self.app.client_manager.network.api
given_show_options = [
'-f',
'shell',
'-c',
'id',
'--prefix',
'TST',
]
then_show_options = [
('formatter', 'shell'),
('columns', ['id']),
('prefix', 'TST'),
]
given_list_options = [
'-f',
'csv',
'-c',
'id',
'--quote',
'all',
]
then_list_options = [
('formatter', 'csv'),
('columns', ['id']),
('quote_mode', 'all'),
]

8
openstackclient/tests/network/v2/test_network.py
View File

@ -92,14 +92,14 @@ class TestCreateNetwork(common.TestNetworkBase):
"--project", identity_fakes_v3.project_name,
"--project-domain", identity_fakes_v3.domain_name,
FAKE_NAME,
] + self.given_show_options
]
verifylist = [
('admin_state', False),
('shared', True),
('project', identity_fakes_v3.project_name),
('project_domain', identity_fakes_v3.domain_name),
('name', FAKE_NAME),
] + self.then_show_options
]
mocker = mock.Mock(return_value=copy.deepcopy(RESPONSE))
self.app.client_manager.network.create_network = mocker
identity_client = identity_fakes_v3.FakeIdentityv3Client(
@ -519,8 +519,8 @@ class TestShowNetwork(common.TestNetworkBase):
self.assertEqual(FILTERED, result)
def test_show_all_options(self, n_mock):
arglist = [FAKE_NAME] + self.given_show_options
verifylist = [('identifier', FAKE_NAME)] + self.then_show_options
arglist = [FAKE_NAME]
verifylist = [('identifier', FAKE_NAME)]
n_mock.return_value = copy.deepcopy(RECORD)
self.cmd = network.ShowNetwork(self.app, self.namespace)