d4e7940457
Adds the scaffolding required for tests to use boto3 and converts the test_bucket.py tests to the new interface. Follow on patches will convert the other tests to use the boto3 library. Notable changes: we no longer try to reach for the equivalent of `boto.make_request()` and instead rely on the boto3/botocore event system to mutate requests as necessary (or to disable pre-flight validators). Partial-Bug: 1557260 Change-Id: I3d77ef4a6b878c49ebfa0c8b8647d7199d87601e
83 lines
3.0 KiB
Python
83 lines
3.0 KiB
Python
# Copyright (c) 2011-2014 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.
|
|
|
|
import unittest2
|
|
import traceback
|
|
import test.functional as tf
|
|
from test.functional.s3api.s3_test_client import (
|
|
Connection, get_boto3_conn, tear_down_s3)
|
|
|
|
|
|
def setUpModule():
|
|
tf.setup_package()
|
|
|
|
|
|
def tearDownModule():
|
|
tf.teardown_package()
|
|
|
|
|
|
class S3ApiBase(unittest2.TestCase):
|
|
def __init__(self, method_name):
|
|
super(S3ApiBase, self).__init__(method_name)
|
|
self.method_name = method_name
|
|
|
|
def setUp(self):
|
|
if 's3api' not in tf.cluster_info:
|
|
raise tf.SkipTest('s3api middleware is not enabled')
|
|
try:
|
|
self.conn = Connection()
|
|
self.conn.reset()
|
|
except Exception:
|
|
message = '%s got an error during initialize process.\n\n%s' % \
|
|
(self.method_name, traceback.format_exc())
|
|
# TODO: Find a way to make this go to FAIL instead of Error
|
|
self.fail(message)
|
|
|
|
def assertCommonResponseHeaders(self, headers, etag=None):
|
|
"""
|
|
asserting common response headers with args
|
|
:param headers: a dict of response headers
|
|
:param etag: a string of md5(content).hexdigest() if not given,
|
|
this won't assert anything about etag. (e.g. DELETE obj)
|
|
"""
|
|
self.assertTrue(headers['x-amz-id-2'] is not None)
|
|
self.assertTrue(headers['x-amz-request-id'] is not None)
|
|
self.assertTrue(headers['date'] is not None)
|
|
# TODO; requires consideration
|
|
# self.assertTrue(headers['server'] is not None)
|
|
if etag is not None:
|
|
self.assertTrue('etag' in headers) # sanity
|
|
self.assertEqual(etag, headers['etag'].strip('"'))
|
|
|
|
|
|
class S3ApiBaseBoto3(S3ApiBase):
|
|
def setUp(self):
|
|
if 's3api' not in tf.cluster_info:
|
|
raise tf.SkipTest('s3api middleware is not enabled')
|
|
try:
|
|
self.conn = get_boto3_conn()
|
|
self.endpoint_url = self.conn._endpoint.host
|
|
self.access_key = self.conn._request_signer._credentials.access_key
|
|
self.region = self.conn._client_config.region_name
|
|
tear_down_s3(self.conn)
|
|
except Exception:
|
|
message = '%s got an error during initialize process.\n\n%s' % \
|
|
(self.method_name, traceback.format_exc())
|
|
# TODO: Find a way to make this go to FAIL instead of Error
|
|
self.fail(message)
|
|
|
|
def tearDown(self):
|
|
tear_down_s3(self.conn)
|