summaryrefslogtreecommitdiffstats
path: root/test/unit/proxy/controllers/test_obj.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/unit/proxy/controllers/test_obj.py')
-rwxr-xr-xtest/unit/proxy/controllers/test_obj.py64
1 files changed, 61 insertions, 3 deletions
diff --git a/test/unit/proxy/controllers/test_obj.py b/test/unit/proxy/controllers/test_obj.py
index e4af789..cae62b0 100755
--- a/test/unit/proxy/controllers/test_obj.py
+++ b/test/unit/proxy/controllers/test_obj.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2010-2012 OpenStack, LLC.
+# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,9 +15,28 @@
# limitations under the License.
import unittest
+from contextlib import contextmanager
+import mock
+
+import swift
from swift.proxy import server as proxy_server
-from test.unit import FakeRing, FakeMemcache
+from test.unit import FakeRing, FakeMemcache, fake_http_connect
+
+
+@contextmanager
+def set_http_connect(*args, **kwargs):
+ old_connect = swift.proxy.controllers.base.http_connect
+ new_connect = fake_http_connect(*args, **kwargs)
+ swift.proxy.controllers.base.http_connect = new_connect
+ swift.proxy.controllers.obj.http_connect = new_connect
+ swift.proxy.controllers.account.http_connect = new_connect
+ swift.proxy.controllers.container.http_connect = new_connect
+ yield new_connect
+ swift.proxy.controllers.base.http_connect = old_connect
+ swift.proxy.controllers.obj.http_connect = old_connect
+ swift.proxy.controllers.account.http_connect = old_connect
+ swift.proxy.controllers.container.http_connect = old_connect
class TestObjControllerWriteAffinity(unittest.TestCase):
@@ -44,7 +63,8 @@ class TestObjControllerWriteAffinity(unittest.TestCase):
def test_iter_nodes_local_first_moves_locals_first(self):
controller = proxy_server.ObjectController(self.app, 'a', 'c', 'o')
- self.app.write_affinity_is_local_fn = (lambda node: node['region'] == 1)
+ self.app.write_affinity_is_local_fn = (
+ lambda node: node['region'] == 1)
self.app.write_affinity_node_count = lambda ring: 4
all_nodes = self.app.object_ring.get_part_nodes(1)
@@ -59,6 +79,44 @@ class TestObjControllerWriteAffinity(unittest.TestCase):
# we don't skip any nodes
self.assertEqual(sorted(all_nodes), sorted(local_first_nodes))
+ def test_connect_put_node_timeout(self):
+ controller = proxy_server.ObjectController(self.app, 'a', 'c', 'o')
+ self.app.conn_timeout = 0.1
+ with set_http_connect(200, slow_connect=True):
+ nodes = [dict(ip='', port='', device='')]
+ res = controller._connect_put_node(nodes, '', '', {}, ('', ''))
+ self.assertTrue(res is None)
+
+
+class TestObjController(unittest.TestCase):
+
+ def test_PUT_log_info(self):
+ # mock out enough to get to the area of the code we want to test
+ with mock.patch('swift.proxy.controllers.obj.check_object_creation',
+ mock.MagicMock(return_value=None)):
+ app = mock.MagicMock()
+ app.container_ring.get_nodes.return_value = (1, [2])
+ app.object_ring.get_nodes.return_value = (1, [2])
+ controller = proxy_server.ObjectController(app, 'a', 'c', 'o')
+ controller.container_info = mock.MagicMock(return_value={
+ 'partition': 1,
+ 'nodes': [{}],
+ 'write_acl': None,
+ 'sync_key': None,
+ 'versions': None})
+ # and now test that we add the header to log_info
+ req = swift.common.swob.Request.blank('/v1/a/c/o')
+ req.headers['x-copy-from'] = 'somewhere'
+ controller.PUT(req)
+ self.assertEquals(
+ req.environ.get('swift.log_info'), ['x-copy-from:somewhere'])
+ # and then check that we don't do that for originating POSTs
+ req = swift.common.swob.Request.blank('/v1/a/c/o')
+ req.method = 'POST'
+ req.headers['x-copy-from'] = 'elsewhere'
+ controller.PUT(req)
+ self.assertEquals(req.environ.get('swift.log_info'), None)
+
if __name__ == '__main__':
unittest.main()