Skip to content

Commit d1fffb2

Browse files
committed
Refactor TestDeleteNetwork: Use TestNetwork in TestDeleteNetwork
Make TestDeleteNetwork inherit from TestNetwork, and have the same class architecture as the other test classes. Change-Id: I37047d7d13931b2a8f25665d6427efc05fc4f989 Implements: blueprint osc-network-unit-test-refactor Related-to: blueprint neutron-client
1 parent ee68558 commit d1fffb2

1 file changed

Lines changed: 19 additions & 9 deletions

File tree

openstackclient/tests/network/v2/test_network.py

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -259,24 +259,34 @@ def test_create_with_domain_identityv2(self):
259259
)
260260

261261

262-
class TestDeleteNetwork(common.TestNetworkBase):
262+
class TestDeleteNetwork(TestNetwork):
263+
264+
def setUp(self):
265+
super(TestDeleteNetwork, self).setUp()
266+
267+
self.network.delete_network = mock.Mock(
268+
return_value=None
269+
)
270+
271+
self.network.list_networks = mock.Mock(
272+
return_value={RESOURCES: [copy.deepcopy(RECORD)]}
273+
)
274+
275+
# Get the command object to test
276+
self.cmd = network.DeleteNetwork(self.app, self.namespace)
277+
263278
def test_delete(self):
264279
arglist = [
265280
FAKE_NAME,
266281
]
267282
verifylist = [
268283
('networks', [FAKE_NAME]),
269284
]
270-
lister = mock.Mock(return_value={RESOURCES: [copy.deepcopy(RECORD)]})
271-
self.app.client_manager.network.list_networks = lister
272-
mocker = mock.Mock(return_value=None)
273-
self.app.client_manager.network.delete_network = mocker
274-
cmd = network.DeleteNetwork(self.app, self.namespace)
275285

276-
parsed_args = self.check_parser(cmd, arglist, verifylist)
277-
result = cmd.take_action(parsed_args)
286+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
287+
result = self.cmd.take_action(parsed_args)
278288

279-
mocker.assert_called_with(FAKE_ID)
289+
self.network.delete_network.assert_called_with(FAKE_ID)
280290
self.assertEqual(None, result)
281291

282292

0 commit comments

Comments
 (0)