openstack
/
ironic
Code Issues Proposed changes

Use assertRaises() instead of fail() 

Just let the test tool api to check the result.

Change-Id: I14446887abef3d2bf974c47d5b55446c623c1dd5
This commit is contained in:
Tang Chen 2016-09-30 16:03:21 +08:00 committed by ChangBo Guo(gcb)
parent 3cae50e2ed
commit 338e4544f8
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ironic/tests/unit/drivers/modules/ilo/test_common.py
View File

@ -125,20 +125,16 @@ class IloValidateParametersTestCase(db_base.DbTestCase):
def test_parse_driver_info_missing_multiple_params(self):
del self.node.driver_info['ilo_password']
del self.node.driver_info['ilo_address']
try:
ilo_common.parse_driver_info(self.node)
self.fail("parse_driver_info did not throw exception.")
except exception.MissingParameterValue as e:
self.assertIn('ilo_password', str(e))
self.assertIn('ilo_address', str(e))
e = self.assertRaises(exception.MissingParameterValue,
ilo_common.parse_driver_info, self.node)
self.assertIn('ilo_password', str(e))
self.assertIn('ilo_address', str(e))
def test_parse_driver_info_invalid_multiple_params(self):
self.node.driver_info['client_timeout'] = 'qwe'
try:
ilo_common.parse_driver_info(self.node)
self.fail("parse_driver_info did not throw exception.")
except exception.InvalidParameterValue as e:
self.assertIn('client_timeout', str(e))
e = self.assertRaises(exception.InvalidParameterValue,
ilo_common.parse_driver_info, self.node)
self.assertIn('client_timeout', str(e))
class IloCommonMethodsTestCase(db_base.DbTestCase):

10
ironic/tests/unit/drivers/modules/irmc/test_common.py
View File

@ -106,12 +106,10 @@ class IRMCValidateParametersTestCase(db_base.DbTestCase):
def test_parse_driver_info_missing_multiple_params(self):
del self.node.driver_info['irmc_password']
del self.node.driver_info['irmc_address']
try:
irmc_common.parse_driver_info(self.node)
self.fail("parse_driver_info did not throw exception.")
except exception.MissingParameterValue as e:
self.assertIn('irmc_password', str(e))
self.assertIn('irmc_address', str(e))
e = self.assertRaises(exception.MissingParameterValue,
irmc_common.parse_driver_info, self.node)
self.assertIn('irmc_password', str(e))
self.assertIn('irmc_address', str(e))
def test_parse_driver_info_invalid_snmp_version(self):
self.node.driver_info['irmc_snmp_version'] = 'v3x'