openstack
/
heat
Code Issues Proposed changes

Merge "Fix incorrect logic during updating in unittest"

This commit is contained in:
Jenkins 2014-04-02 20:10:38 +00:00 committed by Gerrit Code Review
parent d68433c84a 08b702d4c3
commit edd0a23cef
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/tests/test_server.py
View File

@ -1160,9 +1160,11 @@ class ServersTest(HeatTestCase):
'srv_updimgrbld')
new_image = 'F17-x86_64-gold'
# current test demonstrate updating when image_update_policy was not
# changed, so image_update_policy will be used from self.properties
server.t['Properties']['image_update_policy'] = policy
update_template = copy.deepcopy(server.t)
update_template['Properties']['image'] = new_image
server.t['Properties']['image_update_policy'] = policy
self.m.StubOutWithMock(self.fc.servers, 'get')
self.fc.servers.get(1234).MultipleTimes().AndReturn(return_server)
@ -1212,9 +1214,11 @@ class ServersTest(HeatTestCase):
'srv_updrbldfail')
new_image = 'F17-x86_64-gold'
# current test demonstrate updating when image_update_policy was not
# changed, so image_update_policy will be used from self.properties
server.t['Properties']['image_update_policy'] = 'REBUILD'
update_template = copy.deepcopy(server.t)
update_template['Properties']['image'] = new_image
server.t['Properties']['image_update_policy'] = 'REBUILD'
self.m.StubOutWithMock(self.fc.servers, 'get')
self.fc.servers.get(1234).MultipleTimes().AndReturn(return_server)