bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

s3/client: avoid hardwiring env variables names

Browse Source 
instead of hardwiring the names in multiple places, let's just
keep them in a single place as variables, and reference them by
these variables instead of their values.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>
This commit is contained in:
Kefu Chai
2023-08-17 11:46:43 +08:00
parent ec7fa3628c
commit fc6b8d4040
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/object_store/conftest.py
View File

@@ -85,9 +85,9 @@ async def s3_server(pytestconfig, tmpdir):
s3_server_port = pytestconfig.getoption('--s3-server-port')
s3_server_bucket = pytestconfig.getoption('--s3-server-bucket')
default_address = os.environ.get('S3_SERVER_ADDRESS_FOR_TEST')
default_port = os.environ.get('S3_SERVER_PORT_FOR_TEST')
default_bucket = os.environ.get('S3_PUBLIC_BUCKET_FOR_TEST')
default_address = os.environ.get(MinioServer.ENV_ADDRESS)
default_port = os.environ.get(MinioServer.ENV_PORT)
default_bucket = os.environ.get(MinioServer.ENV_BUCKET)
tempdir = tmpdir.strpath
if s3_server_address:

9
test/pylib/minio_server.py
View File

@@ -26,6 +26,9 @@ from io import BufferedWriter
class MinioServer:
ENV_CONFFILE = 'S3_CONFFILE_FOR_TEST'
ENV_ADDRESS = 'S3_SERVER_ADDRESS_FOR_TEST'
ENV_PORT = 'S3_SERVER_PORT_FOR_TEST'
ENV_BUCKET = 'S3_PUBLIC_BUCKET_FOR_TEST'
log_file: BufferedWriter
@@ -192,9 +195,9 @@ class MinioServer:
self.create_conf_file(self.address, self.port, self.config_file)
os.environ[self.ENV_CONFFILE] = f'{self.config_file}'
os.environ['S3_SERVER_ADDRESS_FOR_TEST'] = f'{self.address}'
os.environ['S3_SERVER_PORT_FOR_TEST'] = f'{self.port}'
os.environ['S3_PUBLIC_BUCKET_FOR_TEST'] = f'{self.bucket_name}'
os.environ[self.ENV_ADDRESS] = f'{self.address}'
os.environ[self.ENV_PORT] = f'{self.port}'
os.environ[self.ENV_BUCKET] = f'{self.bucket_name}'
try:
alias = 'local'