Skip to content

Commit 0cc1492

Browse files
committed
Refactor TestShowNetwork: Use TestNetwork in TestShowNetwork
There are severail problems in TestShowNetwork: 1. NETWORK_ITEM is not used. 2. Some redundant code. 3. The param n_mock is used to fake find_attr(), but the name is confusing. So rename it to find_attr(). This patch fixes them. Change-Id: I7bc909057125013fb9d215e92c61f847300f93e2 Implements: blueprint osc-network-unit-test-refactor Related-to: blueprint neutron-client
1 parent 84cf168 commit 0cc1492

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

openstackclient/tests/network/v2/test_network.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from openstackclient.tests import fakes
2020
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes_v2
2121
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
22-
from openstackclient.tests.network import common
2322
from openstackclient.tests.network.v2 import fakes as network_fakes
2423

2524
RESOURCE = 'network'
@@ -414,6 +413,7 @@ def setUp(self):
414413
return_value={RESOURCES: [copy.deepcopy(RECORD)]}
415414
)
416415

416+
# Get the command object to test
417417
self.cmd = network.SetNetwork(self.app, self.namespace)
418418

419419
def test_set_this(self):
@@ -470,40 +470,36 @@ def test_set_nothing(self):
470470
@mock.patch(
471471
'openstackclient.api.network_v2.APIv2.find_attr'
472472
)
473-
class TestShowNetwork(common.TestNetworkBase):
473+
class TestShowNetwork(TestNetwork):
474474

475475
def setUp(self):
476476
super(TestShowNetwork, self).setUp()
477477

478478
# Get the command object to test
479479
self.cmd = network.ShowNetwork(self.app, self.namespace)
480480

481-
self.NETWORK_ITEM = copy.deepcopy(RECORD)
482-
483-
def test_show_no_options(self, n_mock):
481+
def test_show_no_options(self, find_attr):
484482
arglist = [
485483
FAKE_NAME,
486484
]
487485
verifylist = [
488486
('identifier', FAKE_NAME),
489487
]
490-
n_mock.return_value = copy.deepcopy(RECORD)
491-
self.cmd = network.ShowNetwork(self.app, self.namespace)
488+
find_attr.return_value = copy.deepcopy(RECORD)
492489

493490
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
494491
result = list(self.cmd.take_action(parsed_args))
495492

496-
n_mock.assert_called_with('networks', FAKE_NAME)
493+
find_attr.assert_called_with('networks', FAKE_NAME)
497494
self.assertEqual(FILTERED, result)
498495

499-
def test_show_all_options(self, n_mock):
496+
def test_show_all_options(self, find_attr):
500497
arglist = [FAKE_NAME]
501498
verifylist = [('identifier', FAKE_NAME)]
502-
n_mock.return_value = copy.deepcopy(RECORD)
503-
self.cmd = network.ShowNetwork(self.app, self.namespace)
499+
find_attr.return_value = copy.deepcopy(RECORD)
504500

505501
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
506502
result = list(self.cmd.take_action(parsed_args))
507503

508-
n_mock.assert_called_with('networks', FAKE_NAME)
504+
find_attr.assert_called_with('networks', FAKE_NAME)
509505
self.assertEqual(FILTERED, result)

0 commit comments

Comments
 (0)