Test retry logic, fix an off-by-one bug, declare number of retry atte…

…mpts.

lazyboy/connection.py

@@ -28,11 +28,11 @@
 
 _SERVERS = {}
 _CLIENTS = {}
-
+RETRY_ATTEMPTS = 5
 
 def _retry_default_callback(attempt, exc_):
     """Retry an attempt five times, then give up."""
-    return attempt < 5
+    return attempt < RETRY_ATTEMPTS
 
 
 def retry(callback=None):
@@ -44,7 +44,7 @@ def retry(callback=None):
     def __closure__(func):
 
         def __inner__(*args, **kwargs):
-            attempt = 0
+            attempt = 1
             while True:
                 try:
                     return func(*args, **kwargs)

lazyboy/tests/test_connection.py

@@ -221,5 +221,28 @@ def test_get_client(self):
             self.assert_(exc.args[0] != "")
 
 
+class TestRetry(unittest.TestCase):
+
+    """Test retry logic."""
+
+    def test_retry_default_callback(self):
+        """Make sure retry_default_callback works."""
+        for x in range(conn.RETRY_ATTEMPTS):
+            self.assert_(conn._retry_default_callback(x, None))
+
+        self.assert_(not conn._retry_default_callback(x + 1, None))
+
+    def test_retry(self):
+        """Test retry."""
+        retries = []
+        def bad_func():
+            retries.append(True)
+            raise Exception("Whoops.")
+
+        retry_func = conn.retry()(bad_func)
+        self.assertRaises(Exception, retry_func)
+        self.assert_(len(retries) == conn.RETRY_ATTEMPTS)
+
+
 if __name__ == '__main__':
     unittest.main()