openstack/deb-python-openstackclient
Code Issues Proposed changes

Merge "Refactor TestListNetwork: Use TestNetwork in TestListNetwork"

Browse Source
This commit is contained in:
Jenkins
2015-12-06 03:30:27 +00:00
committed by Gerrit Code Review
parent 8e4a386153 697df67611
commit 19d9ccb97a
1 changed files with 44 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,6 @@ RECORD = {
'subnets': ['a', 'b'], 'subnets': ['a', 'b'],
'tenant_id': FAKE_PROJECT, 'tenant_id': FAKE_PROJECT,
} }
COLUMNS = ['ID', 'Name', 'Subnets']
RESPONSE = {RESOURCE: copy.deepcopy(RECORD)} RESPONSE = {RESOURCE: copy.deepcopy(RECORD)}
FILTERED = [ FILTERED = [
( (
@@ -293,7 +292,35 @@ class TestDeleteNetwork(TestNetwork):
@mock.patch( @mock.patch(
'openstackclient.api.network_v2.APIv2.network_list' 'openstackclient.api.network_v2.APIv2.network_list'
) )
class TestListNetwork(common.TestNetworkBase): class TestListNetwork(TestNetwork):
columns = [
'ID',
'Name',
'Subnets'
]
columns_long = [
'ID',
'Name',
'Status',
'Project',
'State',
'Shared',
'Subnets',
'Network Type',
'Router Type',
]
data = [
(FAKE_ID, FAKE_NAME, 'a, b'),
(FAKE_ID, FAKE_NAME, 'a, b'),
]
data_long = [
(FAKE_ID, FAKE_NAME, 'ACTIVE', FAKE_PROJECT,
'UP', '', 'a, b', '', 'External'),
(FAKE_ID, FAKE_NAME, 'ACTIVE', FAKE_PROJECT,
'UP', '', 'a, b', '', 'External'),
]
def setUp(self): def setUp(self):
super(TestListNetwork, self).setUp() super(TestListNetwork, self).setUp()
@@ -306,8 +333,8 @@ class TestListNetwork(common.TestNetworkBase):
copy.deepcopy(RECORD), copy.deepcopy(RECORD),
] ]
def test_network_list_no_options(self, n_mock): def test_network_list_no_options(self, network_list):
n_mock.return_value = self.NETWORK_LIST network_list.return_value = self.NETWORK_LIST
arglist = [] arglist = []
verifylist = [ verifylist = [
@@ -320,19 +347,15 @@ class TestListNetwork(common.TestNetworkBase):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
# Set expected values # Set expected values
n_mock.assert_called_with( network_list.assert_called_with(
external=False, external=False,
) )
self.assertEqual(tuple(COLUMNS), columns) self.assertEqual(tuple(self.columns), columns)
datalist = [ self.assertEqual(self.data, list(data))
(FAKE_ID, FAKE_NAME, 'a, b'),
(FAKE_ID, FAKE_NAME, 'a, b'),
]
self.assertEqual(datalist, list(data))
def test_list_external(self, n_mock): def test_list_external(self, network_list):
n_mock.return_value = self.NETWORK_LIST network_list.return_value = self.NETWORK_LIST
arglist = [ arglist = [
'--external', '--external',
@@ -347,19 +370,15 @@ class TestListNetwork(common.TestNetworkBase):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
# Set expected values # Set expected values
n_mock.assert_called_with( network_list.assert_called_with(
external=True, external=True,
) )
self.assertEqual(tuple(COLUMNS), columns) self.assertEqual(tuple(self.columns), columns)
datalist = [ self.assertEqual(self.data, list(data))
(FAKE_ID, FAKE_NAME, 'a, b'),
(FAKE_ID, FAKE_NAME, 'a, b'),
]
self.assertEqual(datalist, list(data))
def test_network_list_long(self, n_mock): def test_network_list_long(self, network_list):
n_mock.return_value = self.NETWORK_LIST network_list.return_value = self.NETWORK_LIST
arglist = [ arglist = [
'--long', '--long',
@@ -374,38 +393,12 @@ class TestListNetwork(common.TestNetworkBase):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
# Set expected values # Set expected values
n_mock.assert_called_with( network_list.assert_called_with(
external=False, external=False,
) )
collist = ( self.assertEqual(columns, tuple(self.columns_long))
'ID', self.assertEqual(self.data_long, list(data))
'Name',
'Status',
'Project',
'State',
'Shared',
'Subnets',
'Network Type',
'Router Type',
)
self.assertEqual(columns, collist)
dataitem = (
FAKE_ID,
FAKE_NAME,
'ACTIVE',
FAKE_PROJECT,
'UP',
'',
'a, b',
'',
'External',
)
datalist = [
dataitem,
dataitem,
]
self.assertEqual(list(data), datalist)
class TestSetNetwork(common.TestNetworkBase): class TestSetNetwork(common.TestNetworkBase):