WIP

Author: olzhasar-reef

.github/workflows/ci.yml

@@ -50,30 +50,30 @@ jobs:
         run: python -m pip install --upgrade nox pdm
       - name: Build the distribution
         run: nox -vs build
-  cleanup_buckets:
-    timeout-minutes: 30
-    needs: lint
-    env:
-      B2_TEST_APPLICATION_KEY: ${{ secrets.B2_TEST_APPLICATION_KEY }}
-      B2_TEST_APPLICATION_KEY_ID: ${{ secrets.B2_TEST_APPLICATION_KEY_ID }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }}  # TODO: skip this whole job instead
-        with:
-          fetch-depth: 0
-      - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
-        if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }}  # TODO: skip this whole job instead
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
-          cache: "pip"
-      - name: Install dependencies
-        if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }}  # TODO: skip this whole job instead
-        run: python -m pip install --upgrade nox pdm
-      - name: Find and remove old buckets
-        if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }}  # TODO: skip this whole job instead
-        run: nox -vs cleanup_buckets
+  # cleanup_buckets:
+  #   timeout-minutes: 30
+  #   needs: lint
+  #   env:
+  #     B2_TEST_APPLICATION_KEY: ${{ secrets.B2_TEST_APPLICATION_KEY }}
+  #     B2_TEST_APPLICATION_KEY_ID: ${{ secrets.B2_TEST_APPLICATION_KEY_ID }}
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #       if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }}  # TODO: skip this whole job instead
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
+  #       if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }}  # TODO: skip this whole job instead
+  #       uses: actions/setup-python@v5
+  #       with:
+  #         python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
+  #         cache: "pip"
+  #     - name: Install dependencies
+  #       if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }}  # TODO: skip this whole job instead
+  #       run: python -m pip install --upgrade nox pdm
+  #     - name: Find and remove old buckets
+  #       if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }}  # TODO: skip this whole job instead
+  #       run: nox -vs cleanup_buckets
   test:
     timeout-minutes: 90
     needs: cleanup_buckets
@@ -123,8 +123,8 @@ jobs:
           brew install fish
       - name: Install dependencies
         run: python -m pip install --upgrade nox pdm
-      - name: Run unit tests
-        run: nox -vs unit -p ${{ matrix.python-version }}
+      # - name: Run unit tests
+      #   run: nox -vs unit -p ${{ matrix.python-version }}
       - name: Run integration tests (without secrets)
         run: nox -vs integration -p ${{ matrix.python-version }} -- -m "not require_secrets"
       - name: Run integration tests (with secrets)

changelog.d/+ci_workflow_id.fixed.md

@@ -0,0 +1 @@
+Add node description log in ci.

noxfile.py

@@ -231,8 +231,11 @@ def run_integration_test(session, pytest_posargs):
         'test/integration',
         '-n',
         '2' if CI else 'auto',
+        '-s',
         '--log-level',
-        'INFO',
+        'ERROR',
+        '--log-cli-level',
+        'error',
         '-W',
         'ignore::DeprecationWarning:rst2ansi.visitor:',
         *PYTEST_GLOBAL_ARGS,

test/integration/helpers.py

@@ -87,7 +87,16 @@ def get_seed() -> str:
             os.getenv('PYTEST_XDIST_WORKER', 'gw0'),
         )
     )
-    return sha256(seed.encode()).hexdigest()[:16]
+    logger.error('RNG seed (raw): %s', seed)
+
+    seed_hash = sha256(seed.encode()).hexdigest()[:16]
+
+    logger.error('WORKFLOW_ID: %s', os.getenv('WORKFLOW_ID'))
+    logger.error('NODE_DESCRIPTION: %s', NODE_DESCRIPTION)
+    logger.error('PYTEST_XDIST_WORKER: %s', os.getenv('PYTEST_XDIST_WORKER'))
+    logger.error('RNG seed (hashed): %s', seed_hash)
+
+    return seed_hash
 
 
 RNG_SEED = get_seed()
@@ -126,10 +135,12 @@ def bucket_name_part(length: int) -> str:
     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'))
+
+    if 'PYTEST_XDIST_WORKER' not in os.environ:
+        raise RuntimeError('PYTEST_XDIST_WORKER is not set')
+
+    logger.error('RNG_COUNTER: %i, length: %i', RNG_COUNTER, length)
+    logger.error('name_part: %s', name_part)
     return name_part