From eed34140ae82c666d6ba19384835615ed5e0a2d3 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 7 Jan 2011 11:22:05 +0100
Subject: [PATCH] tests didn't pass fxrange

---
 kombu/tests/test_utils.py | 20 ++++++++++----------
 kombu/utils/__init__.py   |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/kombu/tests/test_utils.py b/kombu/tests/test_utils.py
index 7bb32210..2723b599 100644
--- a/kombu/tests/test_utils.py
+++ b/kombu/tests/test_utils.py
@@ -182,7 +182,7 @@ def insomnia(fun):
     return _inner
 
 
-class test_retry_over_Time(unittest.TestCase):
+class test_retry_over_time(unittest.TestCase):
 
     @insomnia
     def test_simple(self):
@@ -193,15 +193,15 @@ class test_retry_over_Time(unittest.TestCase):
 
         def myfun():
             sleepvals = {0: None,
-                         1: 2,
-                         2: 4,
-                         3: 6,
-                         4: 8,
-                         5: 10,
-                         6: 12,
-                         7: 14,
-                         8: 14,
-                         9: 14}
+                         1: 2.0,
+                         2: 4.0,
+                         3: 6.0,
+                         4: 8.0,
+                         5: 10.0,
+                         6: 12.0,
+                         7: 14.0,
+                         8: 16.0,
+                         9: 16.0}
             self.assertEqual(_tried_to_sleep[0], sleepvals[index[0]])
             if index[0] < 9:
                 raise Predicate()
diff --git a/kombu/utils/__init__.py b/kombu/utils/__init__.py
index a59961c2..e4fc7c29 100644
--- a/kombu/utils/__init__.py
+++ b/kombu/utils/__init__.py
@@ -62,7 +62,8 @@ def fxrange(start=1.0, stop=None, step=1.0, repeatlast=False):
     while 1:
         if cur <= stop:
             yield cur
-            cur += step
+            if cur + step <= stop:
+                cur += step
         else:
             if not repeatlast:
                 break