Refactor

* Remove doubles dependency
* Move delays to own file

Author: toddsifleet

requirements-dev.txt

@@ -1,3 +1,3 @@
 flake8==2.1.0
 pytest==2.5.2
-doubles==0.0.1.beta3
+mock==1.0.1

retry/delay.py

@@ -0,0 +1,22 @@
+from random import random as _random
+
+
+def random(min_seconds=0, max_seconds=5):
+    def func(count):
+        return _random(min_seconds, max_seconds)
+
+    return func
+
+
+def exponential(start_at):
+    def func(count):
+        return start_at * (2**count)
+
+    return func
+
+
+def incremental(start_at, step=1):
+    def func(count):
+        return start_at + count*step
+
+    return func

retry/retry.py

@@ -1,28 +1,6 @@
 import time
 from functools import partial, wraps
 from numbers import Number
-from random import random
-
-
-def random_delay(min_seconds=0, max_seconds=5):
-    def func(count):
-        return random(min_seconds, max_seconds)
-
-    return func
-
-
-def doubling_delay(start_at):
-    def func(count):
-        return start_at * (2**count)
-
-    return func
-
-
-def linear_delay(start_at, step=1):
-    def func(count):
-        return start_at + count*step
-
-    return func
 
 
 def _sleep(n):

test/test_delay.py

@@ -0,0 +1,29 @@
+import mock
+
+import retry.delay
+
+
+@mock.patch('retry.delay._random')
+def test_random_calls_stdlib_random(mock_random):
+    mock_random.return_value = 'bob'
+    func = retry.delay.random(0, 1)
+
+    assert func(1) == 'bob'
+    mock_random.assert_called_with(0, 1)
+
+
+def test_exponential_grows_exponentialy():
+    func = retry.delay.exponential(2)
+
+    assert func(0) == 2
+    assert func(1) == 4
+    assert func(2) == 8
+    assert func(3) == 16
+
+
+def test_incremental_grows_by_step():
+    func = retry.delay.incremental(2, 3)
+
+    assert func(0) == 2
+    assert func(1) == 5
+    assert func(2) == 8

test/test_base.py test/test_retry.pytest/test_base.py renamed to test/test_retry.py

@@ -1,5 +1,5 @@
 from pytest import raises
-from doubles import expect
+import mock
 
 from retry import retry
 
@@ -159,34 +159,7 @@ def foo():
     assert e.value.message == 'Test Error 1'
 
 
-def test_retry_with_custom_wait_function():
-    expect(retry)._sleep.with_args(0)
-    expect(retry)._sleep.with_args(1)
-    expect(retry)._sleep.with_args(2)
-    expect(retry)._sleep.with_args(3)
-
+@mock.patch('retry.retry._sleep')
+def test_retry_with_wait_function(mock_sleep):
     retry.call(get_dummy_func(), wait=lambda n: n)
-
-
-def test_retry_with_fixed_wait():
-    expect(retry)._sleep.with_args(1).exactly(4).times
-
-    retry.call(get_dummy_func(), wait=1)
-
-
-def test_retry_with_doubling_delay():
-    expect(retry)._sleep.with_args(1)
-    expect(retry)._sleep.with_args(2)
-    expect(retry)._sleep.with_args(4)
-    expect(retry)._sleep.with_args(8)
-
-    retry.call(get_dummy_func(), wait=retry.doubling_delay(1))
-
-
-def test_retry_with_linear_delay():
-    expect(retry)._sleep.with_args(2)
-    expect(retry)._sleep.with_args(3)
-    expect(retry)._sleep.with_args(4)
-    expect(retry)._sleep.with_args(5)
-
-    retry.call(get_dummy_func(), wait=retry.linear_delay(2, 1))
+    mock_sleep.assert_called_with(3)