Merge pull request #44 from spulec/add-more-boto-versions

Adding more boto versions to testing

.travis.yml

@@ -3,7 +3,11 @@ python:
   - 2.7
 env:
     matrix:
-      - BOTO_VERSION=2.9
+      #- BOTO_VERSION=2.13.3
+      - BOTO_VERSION=2.12.0
+      - BOTO_VERSION=2.11.0
+      - BOTO_VERSION=2.10.0
+      - BOTO_VERSION=2.9.9
       - BOTO_VERSION=2.8
       - BOTO_VERSION=2.7
 install:

tests/test_autoscaling/test_launch_configurations.py

@@ -20,7 +20,6 @@ def test_create_launch_configuration():
         instance_monitoring=True,
         instance_profile_name='arn:aws:iam::123456789012:instance-profile/testing',
         spot_price=0.1,
-        ebs_optimized=True,
     )
     conn.create_launch_configuration(config)
 
@@ -34,7 +33,6 @@ def test_create_launch_configuration():
     launch_config.instance_monitoring.enabled.should.equal('true')
     launch_config.instance_profile_name.should.equal('arn:aws:iam::123456789012:instance-profile/testing')
     launch_config.spot_price.should.equal(0.1)
-    launch_config.ebs_optimized.should.equal(True)
 
 
 @requires_boto_gte("2.12")
@@ -86,7 +84,6 @@ def test_create_launch_configuration_defaults_for_2_12():
     config = LaunchConfiguration(
         name='tester',
         image_id='ami-abcd1234',
-        ebs_optimized=True,
     )
     conn.create_launch_configuration(config)
 

tests/test_elb/test_elb.py

@@ -70,7 +70,8 @@ def test_create_health_check():
         timeout=23,
     )
 
-    lb = conn.create_load_balancer('my-lb', [], [])
+    ports = [(80, 8080, 'http'), (443, 8443, 'tcp')]
+    lb = conn.create_load_balancer('my-lb', [], ports)
     lb.configure_health_check(hc)
 
     balancer = conn.get_all_load_balancers()[0]
@@ -91,7 +92,8 @@ def test_register_instances():
     instance_id2 = reservation.instances[1].id
 
     conn = boto.connect_elb()
-    lb = conn.create_load_balancer('my-lb', [], [])
+    ports = [(80, 8080, 'http'), (443, 8443, 'tcp')]
+    lb = conn.create_load_balancer('my-lb', [], ports)
 
     lb.register_instances([instance_id1, instance_id2])
 
@@ -109,7 +111,8 @@ def test_deregister_instances():
     instance_id2 = reservation.instances[1].id
 
     conn = boto.connect_elb()
-    lb = conn.create_load_balancer('my-lb', [], [])
+    ports = [(80, 8080, 'http'), (443, 8443, 'tcp')]
+    lb = conn.create_load_balancer('my-lb', [], ports)
 
     lb.register_instances([instance_id1, instance_id2])
 

tests/test_elb/test_server.py

@@ -13,4 +13,3 @@ def test_elb_describe_instances():
     res = test_client.get('/?Action=DescribeLoadBalancers')
 
     res.data.should.contain('DescribeLoadBalancersResponse')
-    res.data.should.contain('LoadBalancerName')