Move test helpers and fixtures to the library - working version

Author: kacper-wolkiewicz-reef

b2sdk/_internal/testing/cleanup_buckets.py

@@ -12,11 +12,11 @@
 from test.integration.helpers import authorize
 
 from b2sdk._internal.testing.helpers.api import get_b2_auth_data
-from b2sdk._internal.testing.helpers.bucket_cleaner import BucketCleaner
+from b2sdk._internal.testing.helpers.bucket_manager import BucketManager
 # from .test_raw_api import cleanup_old_buckets
 
 if __name__ == '__main__':
     # cleanup_old_buckets()
-    BucketCleaner(
+    BucketManager(
         dont_cleanup_old_buckets=False, b2_api=authorize(get_b2_auth_data())[0]
-    ).cleanup_buckets()
+    ).clean_buckets()

b2sdk/_internal/testing/fixtures/api.py

@@ -40,5 +40,5 @@ def _b2_api(b2_auth_data):
 
 
 @pytest.fixture(scope='session')
-def b2_api(_b2_api, bucket_cleaner):
+def b2_api(_b2_api, bucket_manager):
     return _b2_api

b2sdk/_internal/testing/fixtures/buckets.py

@@ -13,11 +13,12 @@
 import pytest
 
 from b2sdk._internal.utils import current_time_millis
-from b2sdk._internal.testing.helpers.bucket_cleaner import BucketCleaner
+from b2sdk._internal.testing.helpers.bucket_manager import BucketManager
 from b2sdk._internal.testing.helpers.buckets import (
     BUCKET_CREATED_AT_MILLIS,
     get_bucket_name_prefix,
     random_bucket_name,
+    GENERAL_BUCKET_NAME_PREFIX,
 )
 
 
@@ -41,18 +42,24 @@ def bucket_name_prefix():
 
 
 @pytest.fixture(scope='session')
-def bucket_cleaner(bucket_name_prefix, dont_cleanup_old_buckets, _b2_api):
-    cleaner = BucketCleaner(
+def general_bucket_name_prefix():
+    return GENERAL_BUCKET_NAME_PREFIX
+
+
+@pytest.fixture(scope='session')
+def bucket_manager(bucket_name_prefix, general_bucket_name_prefix, dont_cleanup_old_buckets, _b2_api):
+    cleaner = BucketManager(
         dont_cleanup_old_buckets,
         _b2_api,
         current_run_prefix=bucket_name_prefix,
+        general_prefix=general_bucket_name_prefix
     )
     yield cleaner
-    cleaner.cleanup_buckets()
+    cleaner.clean_buckets()
 
 
 @pytest.fixture
-def bucket(b2_api, bucket_name_prefix, bucket_cleaner):
+def bucket(b2_api, bucket_name_prefix, bucket_manager):
     bucket = b2_api.create_bucket(
         random_bucket_name(bucket_name_prefix),
         'allPrivate',
@@ -62,7 +69,7 @@ def bucket(b2_api, bucket_name_prefix, bucket_cleaner):
         },
     )
     yield bucket
-    bucket_cleaner.cleanup_bucket(bucket)
+    bucket_manager.clean_bucket(bucket)
 
 
 @pytest.fixture

b2sdk/_internal/testing/helpers/api.py

@@ -31,6 +31,7 @@ def get_b2_auth_data():
 
 def authorize(b2_auth_data, api_config=DEFAULT_HTTP_API_CONFIG):
     info = InMemoryAccountInfo()
+    # TODO ME: Cache?
     b2_api = B2Api(info, api_config=api_config)
     realm = os.environ.get('B2_TEST_ENVIRONMENT', 'production')
     b2_api.authorize_account(*b2_auth_data, realm=realm)

b2sdk/_internal/testing/helpers/base.py

@@ -13,7 +13,7 @@
 
 from b2sdk.v2 import B2Api, current_time_millis
 from b2sdk.v2.exception import DuplicateBucketName
-from b2sdk._internal.testing.helpers.bucket_cleaner import BucketCleaner
+from b2sdk._internal.testing.helpers.bucket_manager import BucketManager
 from b2sdk._internal.testing.helpers.buckets import (
     BUCKET_CREATED_AT_MILLIS,
     random_bucket_name,
@@ -24,14 +24,14 @@
 class IntegrationTestBase:
     b2_api: B2Api
     this_run_bucket_name_prefix: str
-    bucket_cleaner: BucketCleaner
+    bucket_manager: BucketManager
 
     @pytest.fixture(autouse=True, scope='class')
-    def cls_setup(self, request, b2_api, b2_auth_data, bucket_name_prefix, bucket_cleaner):
+    def cls_setup(self, request, b2_api, b2_auth_data, bucket_name_prefix, bucket_manager):
         cls = request.cls
         cls.b2_auth_data = b2_auth_data
         cls.this_run_bucket_name_prefix = bucket_name_prefix
-        cls.bucket_cleaner = bucket_cleaner
+        cls.bucket_manager = bucket_manager
         cls.b2_api = b2_api
         cls.info = b2_api.account_info
 
@@ -40,7 +40,7 @@ def setup_method(self):
         self.buckets_created = []
         yield
         for bucket in self.buckets_created:
-            self.bucket_cleaner.cleanup_bucket(bucket)
+            self.bucket_manager.clean_bucket(bucket)
 
     def generate_bucket_name(self):
         return random_bucket_name(self.this_run_bucket_name_prefix)