Merge b3b0e61 into 0ca093d

.travis.yml

@@ -3,6 +3,9 @@ python:
   - "2.7"
   - "3.6"
 
+before_install:
+  - sudo rm -f /etc/boto.cfg
+
 install:
   - pip install coveralls
   - pip install tox-travis

setup.py

@@ -23,7 +23,8 @@ def read(fname):
     },
     include_package_data=True,
     install_requires=[
-        'boto==2.48.0',
+        'botocore==1.12.119',
+        'boto==2.49.0',
         'boto3==1.7.37',
         'PyYAML==3.12',
         'retry==0.9.2'

tests/rolling_deploy_test.py

@@ -214,6 +214,7 @@ def test_confirm_lb_has_only_new_instances(self):
   @mock_elb_deprecated
   def test_lb_healthcheck(self):
     instance_ids = self.setUpEC2()[1]
+    self.rolling_deploy.load_balancer = self.load_balancer_name
     self.assertTrue(self.rolling_deploy.lb_healthcheck(instance_ids)) #Return InService for all instances in ELB
     # Below doesn't work as I am unable to change the instance state. Need to modify elb_healthcheck method and also modify instance_health template.
     ## https://github.com/spulec/moto/blob/master/moto/elb/responses.py#L511 ##
@@ -317,7 +318,7 @@ def test_get_instance_ids_by_requested_build_tag(self):
     self.assertEqual(len(self.rolling_deploy.get_instance_ids_by_requested_build_tag(new_inst, 0)), 2)
     self.assertRaises(Exception, lambda: self.rolling_deploy.get_instance_ids_by_requested_build_tag(new_inst, 1))
 
-    self.rolling_deploy.existing_instance_ids = list(new_inst)
+    self.rolling_deploy.original_instance_ids = list(new_inst)
     self.rolling_deploy.force_redeploy = False
     self.assertEqual(len(self.rolling_deploy.get_instance_ids_by_requested_build_tag(new_inst, 0)), 2)
     self.rolling_deploy.force_redeploy = True