Skip to content

Commit f59e1aa

Browse files
committed
WIP
1 parent c858fef commit f59e1aa

File tree

4 files changed

+29
-18
lines changed

4 files changed

+29
-18
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ jobs:
123123
brew install fish
124124
- name: Install dependencies
125125
run: python -m pip install --upgrade nox pdm
126-
- name: Run unit tests
127-
run: nox -vs unit -p ${{ matrix.python-version }}
126+
# - name: Run unit tests
127+
# run: nox -vs unit -p ${{ matrix.python-version }}
128128
- name: Run integration tests (without secrets)
129129
run: nox -vs integration -p ${{ matrix.python-version }} -- -m "not require_secrets"
130130
- name: Run integration tests (with secrets)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add node description log in ci.

noxfile.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,11 @@ def run_integration_test(session, pytest_posargs):
231231
'test/integration',
232232
'-n',
233233
'2' if CI else 'auto',
234+
'-s',
234235
'--log-level',
235-
'INFO',
236+
'ERROR',
237+
'--log-cli-level',
238+
'error',
236239
'-W',
237240
'ignore::DeprecationWarning:rst2ansi.visitor:',
238241
*PYTEST_GLOBAL_ARGS,
@@ -278,15 +281,15 @@ def test(session):
278281
@nox.session(python=PYTHON_DEFAULT_VERSION)
279282
def cleanup_buckets(session):
280283
"""Remove buckets from previous test runs."""
281-
pdm_install(session, 'test')
282-
session.run(
283-
'pytest',
284-
'-s',
285-
'-x',
286-
*PYTEST_GLOBAL_ARGS,
287-
*session.posargs,
288-
'test/integration/cleanup_buckets.py',
289-
)
284+
# pdm_install(session, 'test')
285+
# session.run(
286+
# 'pytest',
287+
# '-s',
288+
# '-x',
289+
# *PYTEST_GLOBAL_ARGS,
290+
# *session.posargs,
291+
# 'test/integration/cleanup_buckets.py',
292+
# )
290293

291294

292295
@nox.session

test/integration/helpers.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,19 @@ def get_seed() -> str:
8484
os.getenv('WORKFLOW_ID', secrets.token_hex(8)),
8585
NODE_DESCRIPTION,
8686
str(time.time_ns()),
87-
os.getenv('PYTEST_XDIST_WORKER', 'gw0'),
87+
os.getenv('PYTEST_XDIST_WORKER', 'master'),
8888
)
8989
)
90-
return sha256(seed.encode()).hexdigest()[:16]
90+
logger.error('RNG seed (raw): %s', seed)
91+
92+
seed_hash = sha256(seed.encode()).hexdigest()[:16]
93+
94+
logger.error('WORKFLOW_ID: %s', os.getenv('WORKFLOW_ID'))
95+
logger.error('NODE_DESCRIPTION: %s', NODE_DESCRIPTION)
96+
logger.error('PYTEST_XDIST_WORKER: %s', os.getenv('PYTEST_XDIST_WORKER'))
97+
logger.error('RNG seed (hashed): %s', seed_hash)
98+
99+
return seed_hash
91100

92101

93102
RNG_SEED = get_seed()
@@ -126,10 +135,8 @@ def bucket_name_part(length: int) -> str:
126135
global RNG_COUNTER
127136
RNG_COUNTER += 1
128137
name_part = random_token(length, BUCKET_NAME_CHARS_UNIQ)
129-
logger.info('RNG_SEED: %s', RNG_SEED)
130-
logger.info('RNG_COUNTER: %i, length: %i', RNG_COUNTER, length)
131-
logger.info('name_part: %s', name_part)
132-
logger.info('WORKFLOW_ID: %s', os.getenv('WORKFLOW_ID'))
138+
logger.error('RNG_COUNTER: %i, length: %i', RNG_COUNTER, length)
139+
logger.error('name_part: %s', name_part)
133140
return name_part
134141

135142

0 commit comments

Comments
 (0)