openstack/heat
Code Issues Proposed changes

Merge "m1.tiny is not always there"

Browse Source
This commit is contained in:
Jenkins 2016-11-09 02:21:54 +00:00 committed by Gerrit Code Review
commit 2ac817981d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat_integrationtests/functional/test_autoscaling.py
View File

@ -495,7 +495,7 @@ class AutoscalingGroupUpdatePolicyTest(AutoscalingGroupTest):
policy['MaxBatchSize'] = '3'
policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny'
config['Properties']['InstanceType'] = self.conf.minimal_instance_type
self.update_instance_group(updt_template,
num_updates_expected_on_updt=10,
@ -516,7 +516,7 @@ class AutoscalingGroupUpdatePolicyTest(AutoscalingGroupTest):
policy['MaxBatchSize'] = '4'
policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny'
config['Properties']['InstanceType'] = self.conf.minimal_instance_type
self.update_instance_group(updt_template,
num_updates_expected_on_updt=8,

4
heat_integrationtests/functional/test_instance_group.py
View File

@ -469,7 +469,7 @@ class InstanceGroupUpdatePolicyTest(InstanceGroupTest):
policy['MaxBatchSize'] = '3'
policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny'
config['Properties']['InstanceType'] = self.conf.instance_type
self.update_instance_group(updt_template,
num_updates_expected_on_updt=5,
@ -491,7 +491,7 @@ class InstanceGroupUpdatePolicyTest(InstanceGroupTest):
policy['MaxBatchSize'] = '4'
policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny'
config['Properties']['InstanceType'] = self.conf.instance_type
self.update_instance_group(updt_template,
num_updates_expected_on_updt=2,