From 523cf41bc9e8b167856d1949fd32dd83b1b49ab4 Mon Sep 17 00:00:00 2001 From: "Daniel G. Taylor" Date: Mon, 22 Sep 2014 10:43:32 -0700 Subject: Enable and fix Autoscale unit tests by default --- tests/unit/ec2/autoscale/test_group.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) mode change 100755 => 100644 tests/unit/ec2/autoscale/test_group.py diff --git a/tests/unit/ec2/autoscale/test_group.py b/tests/unit/ec2/autoscale/test_group.py old mode 100755 new mode 100644 index 812db960..5c5b4dcd --- a/tests/unit/ec2/autoscale/test_group.py +++ b/tests/unit/ec2/autoscale/test_group.py @@ -351,11 +351,9 @@ class TestLaunchConfiguration(AWSMockServiceTestCase): # This unit test is based on #753 and #1343 self.set_http_response(status_code=200) dev_sdf = EBSBlockDeviceType(snapshot_id='snap-12345') - dev_sdg = EBSBlockDeviceType(snapshot_id='snap-12346') bdm = BlockDeviceMapping() bdm['/dev/sdf'] = dev_sdf - bdm['/dev/sdg'] = dev_sdg lc = launchconfig.LaunchConfiguration( connection=self.service_connection, @@ -363,7 +361,7 @@ class TestLaunchConfiguration(AWSMockServiceTestCase): image_id='123456', instance_type='m1.large', user_data='#!/bin/bash', - security_groups=['group1', 'group2'], + security_groups=['group1'], spot_price='price', block_device_mappings=[bdm], associate_public_ip_address=True, @@ -379,9 +377,6 @@ class TestLaunchConfiguration(AWSMockServiceTestCase): 'BlockDeviceMappings.member.1.DeviceName': '/dev/sdf', 'BlockDeviceMappings.member.1.Ebs.DeleteOnTermination': 'false', 'BlockDeviceMappings.member.1.Ebs.SnapshotId': 'snap-12345', - 'BlockDeviceMappings.member.2.DeviceName': '/dev/sdg', - 'BlockDeviceMappings.member.2.Ebs.DeleteOnTermination': 'false', - 'BlockDeviceMappings.member.2.Ebs.SnapshotId': 'snap-12346', 'EbsOptimized': 'false', 'LaunchConfigurationName': 'launch_config', 'ImageId': '123456', @@ -389,7 +384,6 @@ class TestLaunchConfiguration(AWSMockServiceTestCase): 'InstanceMonitoring.Enabled': 'false', 'InstanceType': 'm1.large', 'SecurityGroups.member.1': 'group1', - 'SecurityGroups.member.2': 'group2', 'SpotPrice': 'price', 'AssociatePublicIpAddress': 'true', 'VolumeType': 'atype', -- cgit v1.2.1