diff options
| author | npraveen35 <npraveen35@gmail.com> | 2017-08-18 15:48:54 +0530 |
|---|---|---|
| committer | Julie Pichon <jpichon@redhat.com> | 2017-11-08 11:59:39 +0000 |
| commit | e2cbe8bedb868cc9412f902f54d75296ce39eed4 (patch) | |
| tree | c359dcdcbf14d138b66c4fbce1f7e1346ff202dc /openstackclient/tests/unit | |
| parent | 0ab7f58188755cd51b9ac1367276875e7d02a501 (diff) | |
| download | python-openstackclient-e2cbe8bedb868cc9412f902f54d75296ce39eed4.tar.gz | |
Neutron agent delete: remove the wrong argument
The take_action() function was calling get_agent() with the wrong
attribute, causing agent deletion to fail. It turns out calling
get_agent() isn't necessary; this removes the call entirely and moves
the 'ignore_missing' argument to the delete_agent() function.
Change-Id: Iaa3754a3be0765112f396495fa5fb2e32e6eae4e
Closes-Bug: #1711301
(cherry picked from commit 6c8e5177bc54ba215aad310094b1eefd6ce709cf)
Diffstat (limited to 'openstackclient/tests/unit')
| -rw-r--r-- | openstackclient/tests/unit/network/v2/test_network_agent.py | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/openstackclient/tests/unit/network/v2/test_network_agent.py b/openstackclient/tests/unit/network/v2/test_network_agent.py index 2fc0c043..18a3cc38 100644 --- a/openstackclient/tests/unit/network/v2/test_network_agent.py +++ b/openstackclient/tests/unit/network/v2/test_network_agent.py @@ -39,10 +39,6 @@ class TestDeleteNetworkAgent(TestNetworkAgent): def setUp(self): super(TestDeleteNetworkAgent, self).setUp() self.network.delete_agent = mock.Mock(return_value=None) - self.network.get_agent = ( - network_fakes.FakeNetworkAgent.get_network_agents( - agents=self.network_agents) - ) # Get the command object to test self.cmd = network_agent.DeleteNetworkAgent(self.app, self.namespace) @@ -58,10 +54,8 @@ class TestDeleteNetworkAgent(TestNetworkAgent): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.network.get_agent.assert_called_once_with( - self.network_agents[0].id, ignore_missing=False) self.network.delete_agent.assert_called_once_with( - self.network_agents[0]) + self.network_agents[0].id, ignore_missing=False) self.assertIsNone(result) def test_multi_network_agents_delete(self): @@ -79,7 +73,7 @@ class TestDeleteNetworkAgent(TestNetworkAgent): calls = [] for n in self.network_agents: - calls.append(call(n)) + calls.append(call(n.id, ignore_missing=False)) self.network.delete_agent.assert_has_calls(calls) self.assertIsNone(result) @@ -94,9 +88,9 @@ class TestDeleteNetworkAgent(TestNetworkAgent): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - find_mock_result = [self.network_agents[0], exceptions.CommandError] - self.network.get_agent = ( - mock.Mock(side_effect=find_mock_result) + delete_mock_result = [True, exceptions.CommandError] + self.network.delete_agent = ( + mock.Mock(side_effect=delete_mock_result) ) try: @@ -105,13 +99,10 @@ class TestDeleteNetworkAgent(TestNetworkAgent): except exceptions.CommandError as e: self.assertEqual('1 of 2 network agents failed to delete.', str(e)) - self.network.get_agent.assert_any_call( + self.network.delete_agent.assert_any_call( self.network_agents[0].id, ignore_missing=False) - self.network.get_agent.assert_any_call( + self.network.delete_agent.assert_any_call( 'unexist_network_agent', ignore_missing=False) - self.network.delete_agent.assert_called_once_with( - self.network_agents[0] - ) class TestListNetworkAgent(TestNetworkAgent): |