summaryrefslogtreecommitdiffstats
path: root/test/unit/proxy/controllers/test_container.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/unit/proxy/controllers/test_container.py')
-rw-r--r--test/unit/proxy/controllers/test_container.py62
1 files changed, 59 insertions, 3 deletions
diff --git a/test/unit/proxy/controllers/test_container.py b/test/unit/proxy/controllers/test_container.py
index 63e6b0e..7c8ecf7 100644
--- a/test/unit/proxy/controllers/test_container.py
+++ b/test/unit/proxy/controllers/test_container.py
@@ -20,6 +20,7 @@ from swift.common.swob import Request
from swift.proxy import server as proxy_server
from swift.proxy.controllers.base import headers_to_container_info
from test.unit import fake_http_connect, FakeRing, FakeMemcache
+from swift.common.request_helpers import get_sys_meta_prefix
class TestContainerController(unittest.TestCase):
@@ -33,7 +34,7 @@ class TestContainerController(unittest.TestCase):
controller = proxy_server.ContainerController(self.app, 'a', 'c')
with mock.patch('swift.proxy.controllers.base.http_connect',
fake_http_connect(200, 200, body='')):
- req = Request.blank('/a/c', {'PATH_INFO': '/a/c'})
+ req = Request.blank('/v1/a/c', {'PATH_INFO': '/v1/a/c'})
resp = controller.HEAD(req)
self.assertEqual(2, resp.status_int // 100)
self.assertTrue("swift.container/a/c" in resp.environ)
@@ -46,7 +47,7 @@ class TestContainerController(unittest.TestCase):
'x-container-sync-key': 'value', 'x-container-sync-to': 'value'}
controller = proxy_server.ContainerController(self.app, 'a', 'c')
- req = Request.blank('/a/c')
+ req = Request.blank('/v1/a/c')
with mock.patch('swift.proxy.controllers.base.http_connect',
fake_http_connect(200, 200, headers=owner_headers)):
resp = controller.HEAD(req)
@@ -54,7 +55,7 @@ class TestContainerController(unittest.TestCase):
for key in owner_headers:
self.assertTrue(key not in resp.headers)
- req = Request.blank('/a/c', environ={'swift_owner': True})
+ req = Request.blank('/v1/a/c', environ={'swift_owner': True})
with mock.patch('swift.proxy.controllers.base.http_connect',
fake_http_connect(200, 200, headers=owner_headers)):
resp = controller.HEAD(req)
@@ -62,6 +63,61 @@ class TestContainerController(unittest.TestCase):
for key in owner_headers:
self.assertTrue(key in resp.headers)
+ def _make_callback_func(self, context):
+ def callback(ipaddr, port, device, partition, method, path,
+ headers=None, query_string=None, ssl=False):
+ context['method'] = method
+ context['path'] = path
+ context['headers'] = headers or {}
+ return callback
+
+ def test_sys_meta_headers_PUT(self):
+ # check that headers in sys meta namespace make it through
+ # the container controller
+ sys_meta_key = '%stest' % get_sys_meta_prefix('container')
+ sys_meta_key = sys_meta_key.title()
+ user_meta_key = 'X-Container-Meta-Test'
+ controller = proxy_server.ContainerController(self.app, 'a', 'c')
+
+ context = {}
+ callback = self._make_callback_func(context)
+ hdrs_in = {sys_meta_key: 'foo',
+ user_meta_key: 'bar',
+ 'x-timestamp': '1.0'}
+ req = Request.blank('/v1/a/c', headers=hdrs_in)
+ with mock.patch('swift.proxy.controllers.base.http_connect',
+ fake_http_connect(200, 200, give_connect=callback)):
+ controller.PUT(req)
+ self.assertEqual(context['method'], 'PUT')
+ self.assertTrue(sys_meta_key in context['headers'])
+ self.assertEqual(context['headers'][sys_meta_key], 'foo')
+ self.assertTrue(user_meta_key in context['headers'])
+ self.assertEqual(context['headers'][user_meta_key], 'bar')
+ self.assertNotEqual(context['headers']['x-timestamp'], '1.0')
+
+ def test_sys_meta_headers_POST(self):
+ # check that headers in sys meta namespace make it through
+ # the container controller
+ sys_meta_key = '%stest' % get_sys_meta_prefix('container')
+ sys_meta_key = sys_meta_key.title()
+ user_meta_key = 'X-Container-Meta-Test'
+ controller = proxy_server.ContainerController(self.app, 'a', 'c')
+ context = {}
+ callback = self._make_callback_func(context)
+ hdrs_in = {sys_meta_key: 'foo',
+ user_meta_key: 'bar',
+ 'x-timestamp': '1.0'}
+ req = Request.blank('/v1/a/c', headers=hdrs_in)
+ with mock.patch('swift.proxy.controllers.base.http_connect',
+ fake_http_connect(200, 200, give_connect=callback)):
+ controller.POST(req)
+ self.assertEqual(context['method'], 'POST')
+ self.assertTrue(sys_meta_key in context['headers'])
+ self.assertEqual(context['headers'][sys_meta_key], 'foo')
+ self.assertTrue(user_meta_key in context['headers'])
+ self.assertEqual(context['headers'][user_meta_key], 'bar')
+ self.assertNotEqual(context['headers']['x-timestamp'], '1.0')
+
if __name__ == '__main__':
unittest.main()