From 8e01f2315c66a982a682ce871609f7810e91c9a1 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 11 Jan 2024 22:38:17 -0500 Subject: [PATCH] fixtures: split setup() and configure() Signed-off-by: Casey Bodley --- s3tests_boto3/functional/__init__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/s3tests_boto3/functional/__init__.py b/s3tests_boto3/functional/__init__.py index a65b54c..0636932 100644 --- a/s3tests_boto3/functional/__init__.py +++ b/s3tests_boto3/functional/__init__.py @@ -174,7 +174,7 @@ def configured_storage_classes(): return sc -def setup(): +def configure(): cfg = configparser.RawConfigParser() try: path = os.environ['S3TEST_CONF'] @@ -267,17 +267,17 @@ def setup(): template = 'test-{random}-' prefix = choose_bucket_prefix(template=template) - alt_client = get_alt_client() - tenant_client = get_tenant_client() - nuke_prefixed_buckets(prefix=prefix) - nuke_prefixed_buckets(prefix=prefix, client=alt_client) - nuke_prefixed_buckets(prefix=prefix, client=tenant_client) - if cfg.has_section("s3 cloud"): get_cloud_config(cfg) else: config.cloud_storage_class = None +def setup(): + alt_client = get_alt_client() + tenant_client = get_tenant_client() + nuke_prefixed_buckets(prefix=prefix) + nuke_prefixed_buckets(prefix=prefix, client=alt_client) + nuke_prefixed_buckets(prefix=prefix, client=tenant_client) def teardown(): alt_client = get_alt_client() @@ -306,11 +306,12 @@ def teardown(): @pytest.fixture(scope="package") def configfile(): - setup() + configure() return config @pytest.fixture(autouse=True) def setup_teardown(configfile): + setup() yield teardown()