Fixed broken tests

celery/tests/test_beat.py

@@ -208,11 +208,19 @@ class TestEmbeddedClockService(unittest.TestCase):
         self.assertTrue(isinstance(s.clockservice, beat.ClockService))
         s.clockservice = MockClockService()
 
+        class _Popen(object):
+            terminated = False
+
+            def terminate(self):
+                self.terminated = True
+
         s.run()
         self.assertTrue(s.clockservice.started)
 
+        s._popen = _Popen()
         s.stop()
         self.assertTrue(s.clockservice.stopped)
+        self.assertTrue(s._popen.terminated)
 
     def test_start_stop_threaded(self):
         s = beat.EmbeddedClockService(thread=True)

celery/tests/test_worker_scheduler.py

@@ -42,7 +42,7 @@ class TestScheduler(unittest.TestCase):
         sched.enter(MockItem("foo"), eta=eta, callback=callback)
 
         remaining = iter(sched).next()
-        self.assertTrue(remaining > 7)
+        self.assertTrue(remaining > 7 or remaining == sched.max_interval)
         self.assertFalse(callback_called[0])
         self.assertRaises(Empty, ready_queue.get_nowait)
 

celery/worker/scheduler.py

@@ -16,7 +16,7 @@ class Scheduler(object):
     """
 
     def __init__(self, ready_queue, max_interval=DEFAULT_MAX_INTERVAL):
-        self.max_interval = max_interval
+        self.max_interval = float(max_interval)
         self.ready_queue = ready_queue
         self._queue = []
 
@@ -58,7 +58,7 @@ class Scheduler(object):
                         heapq.heappush(heap, event)
 
                 if now < eta:
-                    yield min(eta - now, float(self.max_interval))
+                    yield min(eta - now, self.max_interval)
                 else:
                     event = pop(heap)