Merge "Use assertRaises() to check if an exception is raised"

Author: Jenkins

openstackclient/tests/compute/v2/test_server.py

@@ -143,11 +143,10 @@ def test_server_create_no_options(self):
         verifylist = [
             ('server_name', self.new_server.name),
         ]
-        try:
-            # Missing required args should bail here
-            self.check_parser(self.cmd, arglist, verifylist)
-        except utils.ParserException:
-            pass
+
+        # Missing required args should bail here
+        self.assertRaises(utils.ParserException, self.check_parser,
+                          self.cmd, arglist, verifylist)
 
     def test_server_create_minimal(self):
         arglist = [

openstackclient/tests/network/v2/test_network.py

@@ -106,11 +106,9 @@ def test_create_no_options(self):
         arglist = []
         verifylist = []
 
-        try:
-            # Missing required args should bail here
-            self.check_parser(self.cmd, arglist, verifylist)
-        except tests_utils.ParserException:
-            pass
+        # Missing required args should bail here
+        self.assertRaises(tests_utils.ParserException, self.check_parser,
+                          self.cmd, arglist, verifylist)
 
     def test_create_default_options(self):
         arglist = [
@@ -545,11 +543,9 @@ def test_show_no_options(self):
         arglist = []
         verifylist = []
 
-        try:
-            # Missing required args should bail here
-            self.check_parser(self.cmd, arglist, verifylist)
-        except tests_utils.ParserException:
-            pass
+        # Missing required args should bail here
+        self.assertRaises(tests_utils.ParserException, self.check_parser,
+                          self.cmd, arglist, verifylist)
 
     def test_show_all_options(self):
         arglist = [

openstackclient/tests/network/v2/test_router.py

@@ -63,10 +63,9 @@ def test_create_no_options(self):
         arglist = []
         verifylist = []
 
-        try:
-            self.check_parser(self.cmd, arglist, verifylist)
-        except tests_utils.ParserException:
-            pass
+        # Missing required args should bail here
+        self.assertRaises(tests_utils.ParserException, self.check_parser,
+                          self.cmd, arglist, verifylist)
 
     def test_create_default_options(self):
         arglist = [
@@ -303,11 +302,9 @@ def test_set_distributed_centralized(self):
             ('distributed', False),
         ]
 
-        try:
-            # Argument parse failing should bail here
-            self.check_parser(self.cmd, arglist, verifylist)
-        except tests_utils.ParserException:
-            pass
+        # Missing required args should bail here
+        self.assertRaises(tests_utils.ParserException, self.check_parser,
+                          self.cmd, arglist, verifylist)
 
     def test_set_nothing(self):
         arglist = [self._router.name, ]
@@ -353,11 +350,9 @@ def test_show_no_options(self):
         arglist = []
         verifylist = []
 
-        try:
-            # Missing required args should bail here
-            self.check_parser(self.cmd, arglist, verifylist)
-        except tests_utils.ParserException:
-            pass
+        # Missing required args should bail here
+        self.assertRaises(tests_utils.ParserException, self.check_parser,
+                          self.cmd, arglist, verifylist)
 
     def test_show_all_options(self):
         arglist = [