Merge "Integration scenario test refactoring"
diff --git a/common/test.py b/common/test.py
index 2392b8e..8c2a0d2 100644
--- a/common/test.py
+++ b/common/test.py
@@ -204,7 +204,7 @@
message = ('Resource %s failed to reach %s status within '
'the required time (%s s).' %
- (res.resource_name, status, build_timeout))
+ (resource_name, status, build_timeout))
raise exceptions.TimeoutException(message)
def _wait_for_stack_status(self, stack_identifier, status,
@@ -243,7 +243,7 @@
message = ('Stack %s failed to reach %s status within '
'the required time (%s s).' %
- (stack.stack_name, status, build_timeout))
+ (stack_identifier, status, build_timeout))
raise exceptions.TimeoutException(message)
def _stack_delete(self, stack_identifier):
diff --git a/functional/test_instance_group.py b/functional/test_instance_group.py
index 84c63cd..3863df6 100644
--- a/functional/test_instance_group.py
+++ b/functional/test_instance_group.py
@@ -319,7 +319,7 @@
# setup stack from the initial template
files = {'provider.yaml': self.instance_template}
- size = 10
+ size = 5
env = {'resource_registry': {'AWS::EC2::Instance': 'provider.yaml'},
'parameters': {'size': size,
'image': self.conf.image_ref,
@@ -396,7 +396,7 @@
config['Properties']['ImageId'] = self.conf.minimal_image_ref
self.update_instance_group(updt_template,
- num_updates_expected_on_updt=10,
+ num_updates_expected_on_updt=5,
num_creates_expected_on_updt=0,
num_deletes_expected_on_updt=0,
update_replace=True)
@@ -409,15 +409,15 @@
updt_template = self.ig_tmpl_with_updt_policy()
grp = updt_template['Resources']['JobServerGroup']
policy = grp['UpdatePolicy']['RollingUpdate']
- policy['MinInstancesInService'] = '8'
+ policy['MinInstancesInService'] = '4'
policy['MaxBatchSize'] = '4'
config = updt_template['Resources']['JobServerConfig']
config['Properties']['ImageId'] = self.conf.minimal_image_ref
self.update_instance_group(updt_template,
- num_updates_expected_on_updt=8,
- num_creates_expected_on_updt=2,
- num_deletes_expected_on_updt=2,
+ num_updates_expected_on_updt=2,
+ num_creates_expected_on_updt=3,
+ num_deletes_expected_on_updt=3,
update_replace=True)
def test_instance_group_update_replace_huge_batch_size(self):
@@ -433,7 +433,7 @@
config['Properties']['ImageId'] = self.conf.minimal_image_ref
self.update_instance_group(updt_template,
- num_updates_expected_on_updt=10,
+ num_updates_expected_on_updt=5,
num_creates_expected_on_updt=0,
num_deletes_expected_on_updt=0,
update_replace=True)
@@ -446,15 +446,15 @@
group = updt_template['Resources']['JobServerGroup']
policy = group['UpdatePolicy']['RollingUpdate']
policy['MinInstancesInService'] = '20'
- policy['MaxBatchSize'] = '1'
+ policy['MaxBatchSize'] = '2'
policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig']
config['Properties']['ImageId'] = self.conf.minimal_image_ref
self.update_instance_group(updt_template,
- num_updates_expected_on_updt=9,
- num_creates_expected_on_updt=1,
- num_deletes_expected_on_updt=1,
+ num_updates_expected_on_updt=3,
+ num_creates_expected_on_updt=2,
+ num_deletes_expected_on_updt=2,
update_replace=True)
def test_instance_group_update_no_replace(self):
@@ -473,7 +473,7 @@
config['Properties']['InstanceType'] = 'm1.tiny'
self.update_instance_group(updt_template,
- num_updates_expected_on_updt=10,
+ num_updates_expected_on_updt=5,
num_creates_expected_on_updt=0,
num_deletes_expected_on_updt=0,
update_replace=False)
@@ -487,14 +487,14 @@
updt_template = self.ig_tmpl_with_updt_policy()
group = updt_template['Resources']['JobServerGroup']
policy = group['UpdatePolicy']['RollingUpdate']
- policy['MinInstancesInService'] = '8'
+ policy['MinInstancesInService'] = '4'
policy['MaxBatchSize'] = '4'
policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny'
self.update_instance_group(updt_template,
- num_updates_expected_on_updt=8,
- num_creates_expected_on_updt=2,
- num_deletes_expected_on_updt=2,
+ num_updates_expected_on_updt=2,
+ num_creates_expected_on_updt=3,
+ num_deletes_expected_on_updt=3,
update_replace=False)