diff --git a/s3tests_boto3/functional/__init__.py b/s3tests_boto3/functional/__init__.py index 7ca874b..9339403 100644 --- a/s3tests_boto3/functional/__init__.py +++ b/s3tests_boto3/functional/__init__.py @@ -415,25 +415,25 @@ def get_v2_client(): return client def get_sts_client(**kwargs): + kwargs.setdefault('region_name', '') kwargs.setdefault('aws_access_key_id', config.alt_access_key) kwargs.setdefault('aws_secret_access_key', config.alt_secret_key) kwargs.setdefault('config', Config(signature_version='s3v4')) client = boto3.client(service_name='sts', endpoint_url=config.default_endpoint, - region_name='', use_ssl=config.default_is_secure, verify=config.default_ssl_verify, **kwargs) return client def get_iam_client(**kwargs): + kwargs.setdefault('region_name', '') kwargs.setdefault('aws_access_key_id', config.iam_access_key) kwargs.setdefault('aws_secret_access_key', config.iam_secret_key) client = boto3.client(service_name='iam', endpoint_url=config.default_endpoint, - region_name='', use_ssl=config.default_is_secure, verify=config.default_ssl_verify, **kwargs) @@ -453,22 +453,22 @@ def get_iam_s3client(**kwargs): def get_iam_root_client(**kwargs): kwargs.setdefault('service_name', 'iam') + kwargs.setdefault('region_name', '') kwargs.setdefault('aws_access_key_id', config.iam_root_access_key) kwargs.setdefault('aws_secret_access_key', config.iam_root_secret_key) return boto3.client(endpoint_url=config.default_endpoint, - region_name='', use_ssl=config.default_is_secure, verify=config.default_ssl_verify, **kwargs) def get_iam_alt_root_client(**kwargs): kwargs.setdefault('service_name', 'iam') + kwargs.setdefault('region_name', '') kwargs.setdefault('aws_access_key_id', config.iam_alt_root_access_key) kwargs.setdefault('aws_secret_access_key', config.iam_alt_root_secret_key) return boto3.client(endpoint_url=config.default_endpoint, - region_name='', use_ssl=config.default_is_secure, verify=config.default_ssl_verify, **kwargs) diff --git a/s3tests_boto3/functional/test_sns.py b/s3tests_boto3/functional/test_sns.py index 589343b..60d0662 100644 --- a/s3tests_boto3/functional/test_sns.py +++ b/s3tests_boto3/functional/test_sns.py @@ -41,13 +41,15 @@ def sns_alt(iam_alt_root): @pytest.fixture def s3(iam_root): - client = get_iam_root_client(service_name='s3') + # clear region_name to work around Invalid region: region was not a valid DNS name. + client = get_iam_root_client(service_name='s3', region_name=None) yield client nuke_prefixed_buckets(get_prefix(), client) @pytest.fixture def s3_alt(iam_alt_root): - client = get_iam_alt_root_client(service_name='s3') + # clear region_name to work around Invalid region: region was not a valid DNS name. + client = get_iam_alt_root_client(service_name='s3', region_name=None) yield client nuke_prefixed_buckets(get_prefix(), client)