openstack
/
nova
Code Issues Proposed changes

test: pass enable_pass as kwarg in test_evacuate 

Before this commit, parameter mock_save receives the boolean value,
and parameter enable_pass receives the value of mock in method
_test_evacuate_enable_instance_password_conf, that's wrong.

This commit fixes it and ensure enable_instance_password's override
value is valid.

Change-Id: I84f329b2c29fc9e4bda9d2506ee595d3c56f2327
Related-Bug: #1517839
This commit is contained in:
ChangBo Guo(gcb) 2016-06-06 14:36:37 +08:00
parent defdbc1ec5
commit 6962cad094
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/unit/api/openstack/compute/test_evacuate.py
View File

@ -214,10 +214,10 @@ class EvacuateTestV21(test.NoDBTestCase):
self.assertEqual(admin_pass, res['adminPass'])
def test_evacuate_disable_password_return(self):
self._test_evacuate_enable_instance_password_conf(False)
self._test_evacuate_enable_instance_password_conf(enable_pass=False)
def test_evacuate_enable_password_return(self):
self._test_evacuate_enable_instance_password_conf(True)
self._test_evacuate_enable_instance_password_conf(enable_pass=True)
@mock.patch('nova.objects.Instance.save')
def _test_evacuate_enable_instance_password_conf(self, mock_save,
@ -229,7 +229,7 @@ class EvacuateTestV21(test.NoDBTestCase):
if enable_pass:
self.assertIn('adminPass', res)
else:
self.assertIsNone(res.get('adminPass'))
self.assertIsNone(res)
class EvacuatePolicyEnforcementv21(test.NoDBTestCase):