Merge pull request #4185 from bacongobbler/controller-enhancements

ref(controller): code quality enhancements

Author: Matthew Fisher

controller/api/models.py

@@ -381,7 +381,7 @@ def _healthcheck(self, containers, config):
         # HACK (bacongobbler): we need to wait until publisher has a chance to publish each
         # service to etcd, which can take up to 20 seconds.
         time.sleep(20)
-        for i in range(0, 4):
+        for i in xrange(len(intervals)):
             delay = int(config.get('HEALTHCHECK_INITIAL_DELAY', 0))
             try:
                 # sleep until the initial timeout is over
@@ -391,8 +391,8 @@ def _healthcheck(self, containers, config):
                 break
             except exceptions.HealthcheckException as e:
                 try:
-                    new_delay = delay * intervals[i+1]
-                    msg = "{}; trying again in {} seconds".format(e, new_delay)
+                    next_delay = delay * intervals[i+1]
+                    msg = "{}; trying again in {} seconds".format(e, next_delay)
                     log_event(self, msg, logging.WARNING)
                 except IndexError:
                     log_event(self, e, logging.WARNING)

controller/api/tests/test_config.py

@@ -540,7 +540,7 @@ def test_unauthorized_user_cannot_modify_config(self):
                                     HTTP_AUTHORIZATION='token {}'.format(unauthorized_token))
         self.assertEqual(response.status_code, 403)
 
-    def _test_app_healthcheck(self,):
+    def _test_app_healthcheck(self):
         # post a new build, expecting it to pass as usual
         url = "/v1/apps/{self.app}/builds".format(**locals())
         body = {'image': 'autotest/example'}