openstack/swift
Code Issues Proposed changes

Merge "tests: Allow more configuration for S3 cross-compat tests"

Browse Source
This commit is contained in:
Zuul 2025-02-20 22:58:31 +00:00 committed by Gerrit Code Review
commit 7140633925
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/s3api/__init__.py
View File

@ -50,8 +50,8 @@ def load_aws_config(conf_file):
conf = readconf(conf_file, 'default')
global _CONFIG
_CONFIG = {
'endpoint': 'https://s3.amazonaws.com',
'region': 'us-east-1',
'endpoint': conf.get('endpoint', 'https://s3.amazonaws.com'),
'region': conf.get('region', 'us-east-1'),
'access_key1': conf.get('aws_access_key_id'),
'secret_key1': conf.get('aws_secret_access_key'),
'session_token1': conf.get('aws_session_token')