Change tpooled_get_hashes back to err,err on Timeout, (object server REPLICATE needs it) and unit tests

Change-Id: Ic60c33570594fd2c0939043863b013aa2103505d

swift/obj/replicator.py

@@ -202,13 +202,13 @@ def get_hashes(partition_dir, recalculate=[], do_listdir=False,
 def tpooled_get_hashes(*args, **kwargs):
     """
     Hack to work around Eventlet's tpool not catching and reraising Timeouts.
-    We return the Timeout, None if it's raised, the caller looks for it
+    We return the Timeout, Timeout if it's raised, the caller looks for it
     and reraises it if found.
     """
     try:
         return get_hashes(*args, **kwargs)
     except Timeout, err:
-        return err, None
+        return err, err
 
 
 class ObjectReplicator(Daemon):

test/unit/obj/test_server.py

@@ -27,7 +27,7 @@ from time import gmtime, sleep, strftime, time
 from tempfile import mkdtemp
 from hashlib import md5
 
-from eventlet import sleep, spawn, wsgi, listen
+from eventlet import sleep, spawn, wsgi, listen, Timeout
 from webob import Request
 from test.unit import FakeLogger
 from test.unit import _getxattr as getxattr
@@ -38,6 +38,7 @@ from swift.common import utils
 from swift.common.utils import hash_path, mkdirs, normalize_timestamp, \
                                NullLogger, storage_directory
 from swift.common.exceptions import DiskFileNotExist
+from swift.obj import replicator
 from eventlet import tpool
 
 
@@ -2046,6 +2047,54 @@ class TestObjectController(unittest.TestCase):
         self.assertEquals(resp.status_int, 400)
         self.assertTrue('X-Delete-At in past' in resp.body)
 
+    def test_REPLICATE_works(self):
+
+        def fake_get_hashes(*args, **kwargs):
+            return 0, {1: 2}
+
+        def my_tpool_execute(*args, **kwargs):
+            func = args[0]
+            args = args[1:]
+            return func(*args, **kwargs)
+
+        was_get_hashes = replicator.get_hashes
+        replicator.get_hashes = fake_get_hashes
+        was_tpool_exe = tpool.execute
+        tpool.execute = my_tpool_execute
+        try:
+            req = Request.blank('/sda1/p/suff',
+                environ={'REQUEST_METHOD': 'REPLICATE'},
+                headers={})
+            resp = self.object_controller.REPLICATE(req)
+            self.assertEquals(resp.status_int, 200)
+            p_data = pickle.loads(resp.body)
+            self.assertEquals(p_data, {1: 2})
+        finally:
+            tpool.execute = was_tpool_exe
+            replicator.get_hashes = was_get_hashes
+
+    def test_REPLICATE_timeout(self):
+
+        def fake_get_hashes(*args, **kwargs):
+            raise Timeout()
+
+        def my_tpool_execute(*args, **kwargs):
+            func = args[0]
+            args = args[1:]
+            return func(*args, **kwargs)
+
+        was_get_hashes = replicator.get_hashes
+        replicator.get_hashes = fake_get_hashes
+        was_tpool_exe = tpool.execute
+        tpool.execute = my_tpool_execute
+        try:
+            req = Request.blank('/sda1/p/suff',
+                environ={'REQUEST_METHOD': 'REPLICATE'},
+                headers={})
+            self.assertRaises(Timeout, self.object_controller.REPLICATE, req)
+        finally:
+            tpool.execute = was_tpool_exe
+            replicator.get_hashes = was_get_hashes
 
 if __name__ == '__main__':
     unittest.main()