636b922f3b
This attempts to import openstack/swift3 package into swift upstream repository, namespace. This is almost simple porting except following items. 1. Rename swift3 namespace to swift.common.middleware.s3api 1.1 Rename also some conflicted class names (e.g. Request/Response) 2. Port unittests to test/unit/s3api dir to be able to run on the gate. 3. Port functests to test/functional/s3api and setup in-process testing 4. Port docs to doc dir, then address the namespace change. 5. Use get_logger() instead of global logger instance 6. Avoid global conf instance Ex. fix various minor issue on those steps (e.g. packages, dependencies, deprecated things) The details and patch references in the work on feature/s3api are listed at https://trello.com/b/ZloaZ23t/s3api (completed board) Note that, because this is just a porting, no new feature is developed since the last swift3 release, and in the future work, Swift upstream may continue to work on remaining items for further improvements and the best compatibility of Amazon S3. Please read the new docs for your deployment and keep track to know what would be changed in the future releases. Change-Id: Ib803ea89cfee9a53c429606149159dd136c036fd Co-Authored-By: Thiago da Silva <thiago@redhat.com> Co-Authored-By: Tim Burke <tim.burke@gmail.com>
70 lines
2.6 KiB
Python
70 lines
2.6 KiB
Python
# Copyright (c) 2013 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# This stuff can't live in test/unit/__init__.py due to its swob dependency.
|
|
|
|
import unittest
|
|
from test.unit.common.middleware.s3api.helpers import FakeSwift
|
|
from swift.common.middleware.s3api.utils import sysmeta_header
|
|
from swift.common.swob import HeaderKeyDict
|
|
from mock import MagicMock
|
|
|
|
|
|
class S3ApiHelperTestCase(unittest.TestCase):
|
|
def setUp(self):
|
|
self.method = 'HEAD'
|
|
self.path = '/v1/AUTH_test/bucket'
|
|
|
|
def _check_headers(self, swift, method, path, headers):
|
|
_, response_headers, _ = swift._responses[(method, path)]
|
|
self.assertEqual(headers, response_headers)
|
|
|
|
def test_fake_swift_sysmeta(self):
|
|
swift = FakeSwift()
|
|
orig_headers = HeaderKeyDict()
|
|
orig_headers.update({sysmeta_header('container', 'acl'): 'test',
|
|
'x-container-meta-foo': 'bar'})
|
|
|
|
swift.register(self.method, self.path, MagicMock(), orig_headers, None)
|
|
|
|
self._check_headers(swift, self.method, self.path, orig_headers)
|
|
|
|
new_headers = orig_headers.copy()
|
|
del new_headers[sysmeta_header('container', 'acl').title()]
|
|
swift.register(self.method, self.path, MagicMock(), new_headers, None)
|
|
|
|
self._check_headers(swift, self.method, self.path, orig_headers)
|
|
|
|
def test_fake_swift_sysmeta_overwrite(self):
|
|
swift = FakeSwift()
|
|
orig_headers = HeaderKeyDict()
|
|
orig_headers.update({sysmeta_header('container', 'acl'): 'test',
|
|
'x-container-meta-foo': 'bar'})
|
|
swift.register(self.method, self.path, MagicMock(), orig_headers, None)
|
|
|
|
self._check_headers(swift, self.method, self.path, orig_headers)
|
|
|
|
new_headers = orig_headers.copy()
|
|
new_headers[sysmeta_header('container', 'acl').title()] = 'bar'
|
|
|
|
swift.register(self.method, self.path, MagicMock(), new_headers, None)
|
|
|
|
self.assertFalse(orig_headers == new_headers)
|
|
self._check_headers(swift, self.method, self.path, new_headers)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|