Skip to content

Commit 16b084f

Browse files
committed
Merge bitcoin/bitcoin#32194: ci, windows: Do not exclude wallet_migration.py in command line
4a67993 ci, windows: Do not exclude `wallet_migration.py` in command line (Hennadii Stepanov) Pull request description: This PR amends the recently merged bitcoin/bitcoin#31176 to resolve a silent merge conflict with the previously merged bitcoin/bitcoin#31248. Since bitcoin/bitcoin#31248, it is no longer necessary to use `--exclude wallet_migration.py`, as the test is skipped due to not using previous releases. The `wallet_migration.py` test itself still needs to be fixed for Windows by someone who will work on bitcoin/bitcoin#32192. ACKs for top commit: davidgumberg: crACK bitcoin/bitcoin@4a67993 Tree-SHA512: f42428016958cdaccb509cc49341e726eaf1314d85989a7b49888f3862dc4ea0c2988a4792ae62dd925302d0073906397801c8dd2fb06c23381d7cad38730249
2 parents 449e2eb + 4a67993 commit 16b084f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ jobs:
370370

371371
- name: Run functional tests
372372
env:
373-
# TODO: Fix the excluded tests and re-enable them.
374-
EXCLUDE: '--exclude wallet_migration.py,wallet_multiwallet.py'
373+
# TODO: Fix the excluded test and re-enable it.
374+
EXCLUDE: '--exclude wallet_multiwallet.py'
375375
TEST_RUNNER_EXTRA: ${{ github.event_name != 'pull_request' && '--extended' || '' }}
376376
run: py -3 test/functional/test_runner.py --jobs $NUMBER_OF_PROCESSORS --ci --quiet --tmpdirprefix="$RUNNER_TEMP" --combinedlogslen=99999999 --timeout-factor=$TEST_RUNNER_TIMEOUT_FACTOR $EXCLUDE $TEST_RUNNER_EXTRA
377377

0 commit comments

Comments
 (0)