Skip to content

Commit

Permalink
Merge de2af19 into merged_master (Bitcoin PR bitcoin/bitcoin#22987)
Browse files Browse the repository at this point in the history
jamesdorfman committed Apr 21, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents b1a459e + de2af19 commit e55a95a
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ task:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

task:
name: "Win64 native [unit tests, no functional tests] [msvc]"
name: "Win64 native [msvc]"
<< : *FILTER_TEMPLATE
windows_container:
cpu: 4
@@ -94,6 +94,7 @@ task:
QTBASEDIR: 'C:\Qt5.12.11_x64_static_vs2019_160900'
x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
IgnoreWarnIntDirInTempDetected: 'true'
EXCLUDE_TESTS: 'feature_addrman.py,feature_bip68_sequence.py,feature_fee_estimation.py,mining_prioritisetransaction.py,p2p_getaddr_caching.py,p2p_invalid_locator.py,p2p_invalid_tx.py,rpc_misc.py,rpc_net.py,wallet_avoidreuse.py,wallet_descriptor.py,wallet_groups.py,wallet_keypool.py'
merge_script:
- git config --global user.email "[email protected]"
- git config --global user.name "ci"
@@ -147,7 +148,8 @@ task:
- python test\util\test_runner.py
- python test\util\rpcauth-test.py
functional_tests_script:
- python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 rpc_help feature_config_args rpc_signer feature_presegwit_node_upgrade "tool_wallet.py --descriptors" --failfast # TODO enable '--extended' and remove cherry-picked test list
# TODO enable '--extended' and drop '--exclude'.
- python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 --exclude %EXCLUDE_TESTS% --failfast

task:
name: 'ARM [unit tests, no functional tests] [bullseye]'
2 changes: 2 additions & 0 deletions test/functional/test_framework/p2p.py
Original file line number Diff line number Diff line change
@@ -578,6 +578,8 @@ def __init__(self):

NetworkThread.listeners = {}
NetworkThread.protos = {}
if sys.platform == 'win32':
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
NetworkThread.network_event_loop = asyncio.new_event_loop()

def run(self):

0 comments on commit e55a95a

Please sign in to comment.