Merge "Refactor TestCreateNetwork: Setup cmd in setUp() in TestCreateNetworkIdentityV2"

1 files changed, 12 insertions, 11 deletions

diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index ce0a0de7..c45d624b 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -181,6 +181,12 @@ class TestCreateNetworkIdentityV2(TestNetwork):
     def setUp(self):
         super(TestCreateNetworkIdentityV2, self).setUp()
 
+        self.new_network = mock.Mock(return_value=copy.deepcopy(RESPONSE))
+        self.network.create_network = self.new_network
+
+        # Get the command object to test
+        self.cmd = network.CreateNetwork(self.app, self.namespace)
+
     def test_create_with_project_identityv2(self):
         arglist = [
             "--project", identity_fakes_v2.project_name,
@@ -192,8 +198,6 @@ class TestCreateNetworkIdentityV2(TestNetwork):
             ('name', FAKE_NAME),
             ('project', identity_fakes_v2.project_name),
         ]
-        mocker = mock.Mock(return_value=copy.deepcopy(RESPONSE))
-        self.app.client_manager.network.create_network = mocker
         identity_client = identity_fakes_v2.FakeIdentityv2Client(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
@@ -205,12 +209,11 @@ class TestCreateNetworkIdentityV2(TestNetwork):
             copy.deepcopy(identity_fakes_v2.PROJECT),
             loaded=True,
         )
-        cmd = network.CreateNetwork(self.app, self.namespace)
 
-        parsed_args = self.check_parser(cmd, arglist, verifylist)
-        result = list(cmd.take_action(parsed_args))
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        result = list(self.cmd.take_action(parsed_args))
 
-        mocker.assert_called_with({
+        self.network.create_network.assert_called_with({
             RESOURCE: {
                 'admin_state_up': True,
                 'name': FAKE_NAME,
@@ -232,8 +235,6 @@ class TestCreateNetworkIdentityV2(TestNetwork):
             ('project_domain', identity_fakes_v3.domain_name),
             ('name', FAKE_NAME),
         ]
-        mocker = mock.Mock(return_value=copy.deepcopy(RESPONSE))
-        self.app.client_manager.network.create_network = mocker
         identity_client = identity_fakes_v2.FakeIdentityv2Client(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
@@ -245,12 +246,12 @@ class TestCreateNetworkIdentityV2(TestNetwork):
             copy.deepcopy(identity_fakes_v2.PROJECT),
             loaded=True,
         )
-        cmd = network.CreateNetwork(self.app, self.namespace)
-        parsed_args = self.check_parser(cmd, arglist, verifylist)
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
             AttributeError,
-            cmd.take_action,
+            self.cmd.take_action,
             parsed_args,
         )