openstack/python-openstackclient
Code Issues Proposed changes

Use assertRaises() to check if an exception is raised

Browse Source 
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:
Tang Chen
2016-02-14 18:43:19 +08:00
parent d8abec33ad
commit cfcb750a97
3 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openstackclient/tests/compute/v2/test_server.py
View File

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

16
openstackclient/tests/network/v2/test_network.py
View File

@@ -103,11 +103,9 @@ class TestCreateNetworkIdentityV3(TestNetwork):
arglist = [] arglist = []
verifylist = [] verifylist = []
try: # Missing required args should bail here
# Missing required args should bail here self.assertRaises(tests_utils.ParserException, self.check_parser,
self.check_parser(self.cmd, arglist, verifylist) self.cmd, arglist, verifylist)
except tests_utils.ParserException:
pass
def test_create_default_options(self): def test_create_default_options(self):
arglist = [ arglist = [
@@ -542,11 +540,9 @@ class TestShowNetwork(TestNetwork):
arglist = [] arglist = []
verifylist = [] verifylist = []
try: # Missing required args should bail here
# Missing required args should bail here self.assertRaises(tests_utils.ParserException, self.check_parser,
self.check_parser(self.cmd, arglist, verifylist) self.cmd, arglist, verifylist)
except tests_utils.ParserException:
pass
def test_show_all_options(self): def test_show_all_options(self):
arglist = [ arglist = [

23
openstackclient/tests/network/v2/test_router.py
View File

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