Use assertRaises() to check if an exception is raised
In some test cases, try/except is used to check if an exception has been raised. We should use assertRaises() instead. Change-Id: I15c8e757dcab77fd6f895feb018184e1eb7e617b
This commit is contained in:
openstackclient/tests
@ -143,11 +143,10 @@ class TestServerCreate(TestServer):
|
||||
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 = [
|
||||
|
@ -103,11 +103,9 @@ class TestCreateNetworkIdentityV3(TestNetwork):
|
||||
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 = [
|
||||
@ -542,11 +540,9 @@ class TestShowNetwork(TestNetwork):
|
||||
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 = [
|
||||
|
@ -63,10 +63,9 @@ class TestCreateRouter(TestRouter):
|
||||
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 @@ class TestSetRouter(TestRouter):
|
||||
('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 @@ class TestShowRouter(TestRouter):
|
||||
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 = [
|
||||
|
Reference in New Issue
Block a user