Replace some while loops with for loops

Author: lw

cms/util.py

@@ -184,13 +184,11 @@ def get_service_shards(service):
     returns (int): the number of shards defined in the configuration.
 
     """
-    i = 0
-    while True:
+    for i in itertools.count():
         try:
             get_service_address(ServiceCoord(service, i))
         except KeyError:
             return i
-        i += 1
 
 
 def default_argument_parser(description, cls, ask_contest=None):

cmstestsuite/programstarter.py

@@ -204,9 +204,7 @@ def kill(self):
     def _check_with_backoff(self):
         """Check and wait that the service is healthy."""
         self.healthy = False
-        attempts = 0
-        while attempts < _MAX_ATTEMPTS:
-            attempts += 1
+        for attempts in range(_MAX_ATTEMPTS):
             self._check()
             if not self.healthy:
                 time.sleep(0.2 * (1.2 ** attempts))
@@ -321,9 +319,7 @@ def count_unhealthy(self):
         return len([p for p in itervalues(self._programs) if not p.healthy])
 
     def wait(self):
-        attempts = 0
-        while attempts <= _MAX_ATTEMPTS:
-            attempts += 1
+        for attempts in range(_MAX_ATTEMPTS):
             unhealthy = self.count_unhealthy()
             if unhealthy == 0:
                 logger.info("All healthy! Continuing.")