Merge "network.common.NetworkAndComputeShowOne: catch HttpException"

1 files changed, 14 insertions, 0 deletions

diff --git a/openstackclient/tests/unit/network/test_common.py b/openstackclient/tests/unit/network/test_common.py
index 325aad2a..4b9a754b 100644
--- a/openstackclient/tests/unit/network/test_common.py
+++ b/openstackclient/tests/unit/network/test_common.py
@@ -14,6 +14,8 @@
 import argparse
 import mock
 
+import openstack
+from openstackclient.common import exceptions
 from openstackclient.network import common
 from openstackclient.tests.unit import utils
 
@@ -172,3 +174,15 @@ class TestNetworkAndComputeShowOne(TestNetworkAndCompute):
     def setUp(self):
         super(TestNetworkAndComputeShowOne, self).setUp()
         self.cmd = FakeNetworkAndComputeShowOne(self.app, self.namespace)
+
+    def test_take_action_with_http_exception(self):
+        with mock.patch.object(self.cmd, 'take_action_network') as m_action:
+            m_action.side_effect = openstack.exceptions.HttpException("bar")
+            self.assertRaisesRegex(exceptions.CommandError, "bar",
+                                   self.cmd.take_action, mock.Mock())
+
+        self.app.client_manager.network_endpoint_enabled = False
+        with mock.patch.object(self.cmd, 'take_action_compute') as m_action:
+            m_action.side_effect = openstack.exceptions.HttpException("bar")
+            self.assertRaisesRegex(exceptions.CommandError, "bar",
+                                   self.cmd.take_action, mock.Mock())