Clean up imports and use bucket manager in base test case.

Author: kacper-wolkiewicz-reef

b2sdk/_internal/testing/fixtures/buckets.py

@@ -15,12 +15,9 @@
 
 from b2sdk._internal.testing.helpers.bucket_manager import BucketManager
 from b2sdk._internal.testing.helpers.buckets import (
-    BUCKET_CREATED_AT_MILLIS,
     GENERAL_BUCKET_NAME_PREFIX,
     get_bucket_name_prefix,
-    random_bucket_name,
 )
-from b2sdk._internal.utils import current_time_millis
 
 
 def pytest_addoption(parser):
@@ -62,15 +59,8 @@ def bucket_manager(
 
 
 @pytest.fixture
-def bucket(b2_api, bucket_name_prefix, bucket_manager):
-    bucket = b2_api.create_bucket(
-        random_bucket_name(bucket_name_prefix),
-        'allPrivate',
-        bucket_info={
-            'created_by': 'b2-sdk integration test',
-            BUCKET_CREATED_AT_MILLIS: str(current_time_millis()),
-        },
-    )
+def bucket(bucket_name_prefix, bucket_manager):
+    bucket = bucket_manager.create_bucket()
     yield bucket
     bucket_manager.clean_bucket(bucket)
 

b2sdk/_internal/testing/helpers/api.py

@@ -11,11 +11,9 @@
 
 import os
 
-from b2sdk.v3 import (
-    DEFAULT_HTTP_API_CONFIG,
-    B2Api,
-    InMemoryAccountInfo,
-)
+from b2sdk._internal.account_info.in_memory import InMemoryAccountInfo
+from b2sdk._internal.api import B2Api
+from b2sdk._internal.api_config import DEFAULT_HTTP_API_CONFIG
 
 
 def get_realm() -> str:

b2sdk/_internal/testing/helpers/base.py

@@ -12,11 +12,7 @@
 import pytest
 
 from b2sdk._internal.testing.helpers.bucket_manager import BucketManager
-from b2sdk._internal.testing.helpers.buckets import (
-    BUCKET_CREATED_AT_MILLIS,
-    random_bucket_name,
-)
-from b2sdk.v2 import B2Api, current_time_millis
+from b2sdk.v2 import B2Api
 from b2sdk.v2.exception import DuplicateBucketName
 
 
@@ -42,9 +38,6 @@ def setup_method(self):
         for bucket in self.buckets_created:
             self.bucket_manager.clean_bucket(bucket)
 
-    def generate_bucket_name(self):
-        return random_bucket_name(self.this_run_bucket_name_prefix)
-
     def write_zeros(self, file, number):
         line = b'0' * 1000 + b'\n'
         line_len = len(line)
@@ -54,13 +47,9 @@ def write_zeros(self, file, number):
             written += line_len
 
     def create_bucket(self):
-        bucket_name = self.generate_bucket_name()
+        bucket_name = self.bucket_manager.new_bucket_name()
         try:
-            bucket = self.b2_api.create_bucket(
-                bucket_name,
-                'allPrivate',
-                bucket_info={BUCKET_CREATED_AT_MILLIS: str(current_time_millis())},
-            )
+            bucket = self.bucket_manager.create_bucket(name=bucket_name)
         except DuplicateBucketName:
             self._duplicated_bucket_name_debug_info(bucket_name)
             raise

b2sdk/_internal/testing/helpers/bucket_manager.py

@@ -18,22 +18,17 @@
 
 import tenacity
 
-from b2sdk._internal.exception import BucketIdNotFound, FileNotPresent, TooManyRequests
+from b2sdk._internal.api import B2Api
+from b2sdk._internal.bucket import Bucket
+from b2sdk._internal.exception import BadRequest, BucketIdNotFound, FileNotPresent, TooManyRequests
+from b2sdk._internal.file_lock import NO_RETENTION_FILE_SETTING, LegalHold, RetentionMode
 from b2sdk._internal.testing.helpers.buckets import (
     BUCKET_CREATED_AT_MILLIS,
     BUCKET_NAME_LENGTH,
     GENERAL_BUCKET_NAME_PREFIX,
     random_token,
 )
-from b2sdk.v3 import (
-    NO_RETENTION_FILE_SETTING,
-    B2Api,
-    Bucket,
-    LegalHold,
-    RetentionMode,
-    current_time_millis,
-)
-from b2sdk.v3.exception import BadRequest
+from b2sdk._internal.utils import current_time_millis
 
 NODE_DESCRIPTION = f'{platform.node()}: {platform.platform()}'
 ONE_HOUR_MILLIS = 60 * 60 * 1000
@@ -70,7 +65,7 @@ def new_bucket_info(self) -> dict:
         }
 
     def create_bucket(self, bucket_type: str = 'allPublic', **kwargs) -> Bucket:
-        bucket_name = self.new_bucket_name()
+        bucket_name = kwargs.pop('name', self.new_bucket_name())
         return self.b2_api.create_bucket(
             bucket_name,
             bucket_type=bucket_type,

b2sdk/_internal/testing/helpers/buckets.py

@@ -11,10 +11,7 @@
 
 import secrets
 
-from b2sdk.v3 import (
-    BUCKET_NAME_CHARS_UNIQ,
-    BUCKET_NAME_LENGTH_RANGE,
-)
+from b2sdk._internal.http_constants import BUCKET_NAME_CHARS_UNIQ, BUCKET_NAME_LENGTH_RANGE
 
 GENERAL_BUCKET_NAME_PREFIX = 'sdktst'
 BUCKET_NAME_LENGTH = BUCKET_NAME_LENGTH_RANGE[1]
@@ -29,7 +26,3 @@ def random_token(length: int, chars: str = BUCKET_NAME_CHARS_UNIQ) -> str:
 
 def get_bucket_name_prefix(rnd_len: int = 8) -> str:
     return GENERAL_BUCKET_NAME_PREFIX + random_token(rnd_len)
-
-
-def random_bucket_name(prefix: str = GENERAL_BUCKET_NAME_PREFIX) -> str:
-    return prefix + random_token(BUCKET_NAME_LENGTH - len(prefix))

b2sdk/v3/testing/__init__.py

@@ -20,7 +20,6 @@
     RNG,
     random_token,
     get_bucket_name_prefix,
-    random_bucket_name,
 )
 from b2sdk._internal.testing.helpers.bucket_manager import (
     NODE_DESCRIPTION,

test/integration/conftest.py

@@ -8,17 +8,5 @@
 #
 ######################################################################
 
-from b2sdk.v3.testing import (  # noqa: F401
-    _b2_api,
-    b2_api,
-    b2_auth_data,
-    b2_subfolder,
-    bucket,
-    bucket_manager,
-    bucket_name_prefix,
-    dont_cleanup_old_buckets,
-    general_bucket_name_prefix,
-    pytest_addoption,
-    realm,
-    set_http_debug,
-)
+
+pytest_plugins = ["b2sdk.v3.testing"]

test/integration/test_raw_api.py

@@ -168,7 +168,7 @@ def raw_api_test_helper(raw_api, should_cleanup_old_buckets):
         account_auth_token,
         account_id,
         bucket_name,
-        'allPrivate',
+        'allPublic',
         is_file_lock_enabled=True,
     )
     bucket_id = bucket_dict['bucketId']
@@ -208,7 +208,7 @@ def raw_api_test_helper(raw_api, should_cleanup_old_buckets):
             account_auth_token,
             account_id,
             replication_source_bucket_name,
-            'allPrivate',
+            'allPublic',
             is_file_lock_enabled=True,
             replication=ReplicationConfiguration(
                 rules=[