Browse Source

[tests] Rename p2p_* functional tests.

0.16
Anthony Towns 7 years ago
parent
commit
61b8f7f273
  1. 4
      test/functional/README.md
  2. 0
      test/functional/p2p_compactblocks.py
  3. 0
      test/functional/p2p_disconnect_ban.py
  4. 0
      test/functional/p2p_feefilter.py
  5. 0
      test/functional/p2p_fingerprint.py
  6. 0
      test/functional/p2p_invalid_block.py
  7. 0
      test/functional/p2p_invalid_tx.py
  8. 0
      test/functional/p2p_leak.py
  9. 0
      test/functional/p2p_mempool.py
  10. 0
      test/functional/p2p_node_network_limited.py
  11. 0
      test/functional/p2p_segwit.py
  12. 0
      test/functional/p2p_sendheaders.py
  13. 0
      test/functional/p2p_timeouts.py
  14. 0
      test/functional/p2p_unrequested_blocks.py
  15. 28
      test/functional/test_runner.py

4
test/functional/README.md

@ -87,7 +87,7 @@ start the networking thread. (Continue with the test logic in your existing
thread.) thread.)
- Can be used to write tests where specific P2P protocol behavior is tested. - Can be used to write tests where specific P2P protocol behavior is tested.
Examples tests are `p2p-acceptblock.py`, `p2p-compactblocks.py`. Examples tests are `p2p_unrequested_blocks.py`, `p2p_compactblocks.py`.
#### Comptool #### Comptool
@ -133,7 +133,7 @@ Each `TestInstance` consists of:
acceptance is tested against the given outcome. acceptance is tested against the given outcome.
- For examples of tests written in this framework, see - For examples of tests written in this framework, see
`invalidblockrequest.py` and `feature_block.py`. `p2p_invalid_block.py` and `feature_block.py`.
### test-framework modules ### test-framework modules

0
test/functional/p2p-compactblocks.py → test/functional/p2p_compactblocks.py

0
test/functional/disconnect_ban.py → test/functional/p2p_disconnect_ban.py

0
test/functional/p2p-feefilter.py → test/functional/p2p_feefilter.py

0
test/functional/p2p-fingerprint.py → test/functional/p2p_fingerprint.py

0
test/functional/invalidblockrequest.py → test/functional/p2p_invalid_block.py

0
test/functional/invalidtxrequest.py → test/functional/p2p_invalid_tx.py

0
test/functional/p2p-leaktests.py → test/functional/p2p_leak.py

0
test/functional/p2p-mempool.py → test/functional/p2p_mempool.py

0
test/functional/node_network_limited.py → test/functional/p2p_node_network_limited.py

0
test/functional/p2p-segwit.py → test/functional/p2p_segwit.py

0
test/functional/sendheaders.py → test/functional/p2p_sendheaders.py

0
test/functional/p2p-timeouts.py → test/functional/p2p_timeouts.py

0
test/functional/p2p-acceptblock.py → test/functional/p2p_unrequested_blocks.py

28
test/functional/test_runner.py

@ -60,16 +60,16 @@ BASE_SCRIPTS= [
# vv Tests less than 5m vv # vv Tests less than 5m vv
'feature_block.py', 'feature_block.py',
'fundrawtransaction.py', 'fundrawtransaction.py',
'p2p-compactblocks.py', 'p2p_compactblocks.py',
'feature_segwit.py', 'feature_segwit.py',
# vv Tests less than 2m vv # vv Tests less than 2m vv
'wallet_basic.py', 'wallet_basic.py',
'wallet_accounts.py', 'wallet_accounts.py',
'p2p-segwit.py', 'p2p_segwit.py',
'wallet_dump.py', 'wallet_dump.py',
'listtransactions.py', 'listtransactions.py',
# vv Tests less than 60s vv # vv Tests less than 60s vv
'sendheaders.py', 'p2p_sendheaders.py',
'wallet_zapwallettxes.py', 'wallet_zapwallettxes.py',
'wallet_importmulti.py', 'wallet_importmulti.py',
'mempool_limit.py', 'mempool_limit.py',
@ -99,17 +99,17 @@ BASE_SCRIPTS= [
'multi_rpc.py', 'multi_rpc.py',
'feature_proxy.py', 'feature_proxy.py',
'signrawtransactions.py', 'signrawtransactions.py',
'disconnect_ban.py', 'p2p_disconnect_ban.py',
'decodescript.py', 'decodescript.py',
'blockchain.py', 'blockchain.py',
'deprecated_rpc.py', 'deprecated_rpc.py',
'wallet_disable.py', 'wallet_disable.py',
'net.py', 'net.py',
'wallet_keypool.py', 'wallet_keypool.py',
'p2p-mempool.py', 'p2p_mempool.py',
'prioritise_transaction.py', 'prioritise_transaction.py',
'invalidblockrequest.py', 'p2p_invalid_block.py',
'invalidtxrequest.py', 'p2p_invalid_tx.py',
'feature_versionbits_warning.py', 'feature_versionbits_warning.py',
'preciousblock.py', 'preciousblock.py',
'wallet_importprunedfunds.py', 'wallet_importprunedfunds.py',
@ -120,18 +120,18 @@ BASE_SCRIPTS= [
'wallet_bumpfee.py', 'wallet_bumpfee.py',
'rpcnamedargs.py', 'rpcnamedargs.py',
'wallet_listsinceblock.py', 'wallet_listsinceblock.py',
'p2p-leaktests.py', 'p2p_leak.py',
'wallet_encryption.py', 'wallet_encryption.py',
'feature_dersig.py', 'feature_dersig.py',
'feature_cltv.py', 'feature_cltv.py',
'uptime.py', 'uptime.py',
'wallet_resendwallettransactions.py', 'wallet_resendwallettransactions.py',
'feature_minchainwork.py', 'feature_minchainwork.py',
'p2p-fingerprint.py', 'p2p_fingerprint.py',
'feature_uacomment.py', 'feature_uacomment.py',
'p2p-acceptblock.py', 'p2p_unrequested_blocks.py',
'feature_logging.py', 'feature_logging.py',
'node_network_limited.py', 'p2p_node_network_limited.py',
'feature_config_args.py', 'feature_config_args.py',
# Don't append tests at the end to avoid merge conflicts # Don't append tests at the end to avoid merge conflicts
# Put them in a random line within the section that fits their approximate run-time # Put them in a random line within the section that fits their approximate run-time
@ -150,10 +150,10 @@ EXTENDED_SCRIPTS = [
# vv Tests less than 2m vv # vv Tests less than 2m vv
'feature_bip68_sequence.py', 'feature_bip68_sequence.py',
'getblocktemplate_longpoll.py', 'getblocktemplate_longpoll.py',
'p2p-timeouts.py', 'p2p_timeouts.py',
# vv Tests less than 60s vv # vv Tests less than 60s vv
'feature_bip9_softforks.py', 'feature_bip9_softforks.py',
'p2p-feefilter.py', 'p2p_feefilter.py',
'rpcbind_test.py', 'rpcbind_test.py',
# vv Tests less than 30s vv # vv Tests less than 30s vv
'feature_assumevalid.py', 'feature_assumevalid.py',
@ -474,7 +474,7 @@ class TestResult():
def check_script_prefixes(): def check_script_prefixes():
"""Check that no more than `EXPECTED_VIOLATION_COUNT` of the """Check that no more than `EXPECTED_VIOLATION_COUNT` of the
test scripts don't start with one of the allowed name prefixes.""" test scripts don't start with one of the allowed name prefixes."""
EXPECTED_VIOLATION_COUNT = 37 EXPECTED_VIOLATION_COUNT = 24
# LEEWAY is provided as a transition measure, so that pull-requests # LEEWAY is provided as a transition measure, so that pull-requests
# that introduce new tests that don't conform with the naming # that introduce new tests that don't conform with the naming

Loading…
Cancel
Save