From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 24 Feb 2014 21:22:59 +0000 (-0500)
Subject: use itertools for seconds sum
X-Git-Tag: 1.1.0~1631^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25919351804691cc47556e4486e580340e79d8d2;p=teuthology.git

use itertools for seconds sum

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/teuthology/contextutil.py b/teuthology/contextutil.py
index 90c101962..4306cde41 100644
--- a/teuthology/contextutil.py
+++ b/teuthology/contextutil.py
@@ -2,6 +2,7 @@ import contextlib
 import sys
 import logging
 import time
+import itertools
 
 log = logging.getLogger(__name__)
 
@@ -78,12 +79,13 @@ class safe_while(object):
 
     """
 
-    def __init__(self, sleep=5, increment=5, tries=5):
+    def __init__(self, sleep=5, increment=5, tries=5, _sleeper=None):
         self.sleep = sleep
         self.increment = increment
         self.tries = tries
         self.counter = 0
         self.sleep_current = sleep
+        self.sleeper = _sleeper or time.sleep
 
     def _make_error_msg(self):
         """
@@ -91,9 +93,9 @@ class safe_while(object):
         of tries we attempted
         """
         total_seconds_waiting = sum(
-            map(
-                lambda x: x * self.increment,
-                range(1, self.tries+1)
+            itertools.islice(
+                itertools.count(self.sleep, self.increment),
+                self.tries
             )
         )
         return 'reached maximum tries (%s) after waiting for %s seconds' % (
@@ -105,7 +107,7 @@ class safe_while(object):
         if self.counter > self.tries:
             error_msg = self._make_error_msg()
             raise MaxWhileTries(error_msg)
-        time.sleep(self.sleep_current)
+        self.sleeper(self.sleep_current)
         self.sleep_current += self.increment
 
     def __enter__(self):