Use RNG from b2sdk for bucket name generation in tests

Author: kacper-wolkiewicz-reef

test/integration/conftest.py

@@ -23,7 +23,7 @@
 
 import pytest
 from b2sdk.v3 import B2_ACCOUNT_INFO_ENV_VAR, XDG_CONFIG_HOME_ENV_VAR
-from b2sdk.v3.testing import random_token
+from b2sdk.v3.testing import NODE_DESCRIPTION, RNG_SEED, random_token
 
 from b2._internal.version_listing import (
     CLI_VERSIONS,
@@ -33,7 +33,7 @@
 )
 
 from ..helpers import b2_uri_args_v3, b2_uri_args_v4
-from .helpers import NODE_DESCRIPTION, RNG_SEED, CommandLine, bucket_name_part
+from .helpers import CommandLine
 from .persistent_bucket import (
     PersistentBucketAggregate,
     get_or_create_persistent_bucket,
@@ -221,11 +221,6 @@ def general_bucket_name_prefix():
     return GENERAL_BUCKET_NAME_PREFIX
 
 
-@pytest.fixture(scope='session')
-def bucket_name_prefix(general_bucket_name_prefix):
-    return f'{general_bucket_name_prefix}{bucket_name_part(8)}'
-
-
 @pytest.fixture(scope='session')
 def bucket_manager(
     bucket_manager,

test/integration/helpers.py

@@ -14,65 +14,34 @@
 import os
 import pathlib
 import platform
-import random
 import re
-import secrets
 import shutil
-import string
 import subprocess
 import sys
 import threading
-import time
 import warnings
 from collections.abc import Iterable
-from hashlib import sha256
 from os import environ, linesep
 from pathlib import Path
 from tempfile import mkdtemp, mktemp
 from typing import TypeVar
 
 from b2sdk.v3 import (
     ALL_CAPABILITIES,
-    BUCKET_NAME_CHARS_UNIQ,
     EncryptionAlgorithm,
     EncryptionKey,
     EncryptionMode,
     EncryptionSetting,
     fix_windows_path_limit,
 )
-from b2sdk.v3.testing import ONE_HOUR_MILLIS, BucketManager
+from b2sdk.v3.testing import ONE_HOUR_MILLIS, RNG, BucketManager
 
 from b2._internal.console_tool import Command
 
 logger = logging.getLogger(__name__)
 
 ONE_DAY_MILLIS = ONE_HOUR_MILLIS * 24
 
-NODE_DESCRIPTION = f'{platform.node()}: {platform.platform()} {platform.python_version()}'
-
-
-def get_seed() -> str:
-    """
-    Get seed for random number generator.
-
-    The `WORKFLOW_ID` variable has to be set in the CI to uniquely identify
-    the current workflow (including the attempt)
-    """
-    seed = ''.join(
-        (
-            os.getenv('WORKFLOW_ID', secrets.token_hex(8)),
-            NODE_DESCRIPTION,
-            str(time.time_ns()),
-            os.getenv('PYTEST_XDIST_WORKER', 'gw0'),
-        )
-    )
-    return sha256(seed.encode()).hexdigest()[:16]
-
-
-RNG_SEED = get_seed()
-RNG = random.Random(RNG_SEED)
-RNG_COUNTER = 0
-
 SSE_NONE = EncryptionSetting(
     mode=EncryptionMode.NONE,
 )
@@ -93,22 +62,6 @@ def get_seed() -> str:
 )
 
 
-def random_token(length: int, chars=string.ascii_letters) -> str:
-    return ''.join(RNG.choice(chars) for _ in range(length))
-
-
-def bucket_name_part(length: int) -> str:
-    assert length >= 1
-    global RNG_COUNTER
-    RNG_COUNTER += 1
-    name_part = random_token(length, BUCKET_NAME_CHARS_UNIQ)
-    logger.info('RNG_SEED: %s', RNG_SEED)
-    logger.info('RNG_COUNTER: %i, length: %i', RNG_COUNTER, length)
-    logger.info('name_part: %s', name_part)
-    logger.info('WORKFLOW_ID: %s', os.getenv('WORKFLOW_ID'))
-    return name_part
-
-
 T = TypeVar('T')