Merge branch '3.0'

celery/tests/worker/test_worker.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import socket
+import sys
 
 from collections import deque
 from datetime import datetime, timedelta
@@ -462,6 +463,8 @@ class test_Consumer(Case):
         self.assertIs(self.ready_queue.get_nowait(), task)
 
     def test_receieve_message_eta_isoformat(self):
+        if sys.version_info < (2, 6):
+            raise SkipTest('test broken on Python 2.5')
         l = MyKombuConsumer(self.ready_queue, timer=self.timer)
         m = create_message(Mock(), task=foo_task.name,
                            eta=datetime.now().isoformat(),