aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_runner.py
diff options
context:
space:
mode:
authorSuhas Daftuar <sdaftuar@gmail.com>2017-06-28 14:52:24 -0400
committerSuhas Daftuar <sdaftuar@gmail.com>2017-06-30 09:04:36 -0400
commitd4f0d87b6fe800b6500dc5baff2e8db33e151da5 (patch)
treefd07108816d4823e36b0c909b824be70eec664ca /test/functional/test_runner.py
parentd4e551adfec298d12f2147467227f07e3a94b872 (diff)
downloadbitcoin-d4f0d87b6fe800b6500dc5baff2e8db33e151da5.tar.xz
[qa] Rewrite BIP65 functional tests
After 122786d0e0170c73536360b705af711e1338adbf, BIP65 activates at a particular height (without regard to version numbers of blocks below that height). Rewrite the BIP65 functional tests to take this into account, and add a test case that exercises OP_CHECKLOCKTIMEVERIFY in a block where the soft-fork is active. Also moves the bip65 functional test out of the extended test suite.
Diffstat (limited to 'test/functional/test_runner.py')
-rwxr-xr-xtest/functional/test_runner.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 54f625514b..c8c794c772 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -113,6 +113,7 @@ BASE_SCRIPTS= [
'listsinceblock.py',
'p2p-leaktests.py',
'wallet-encryption.py',
+ 'bip65-cltv-p2p.py',
'uptime.py',
]
@@ -136,8 +137,6 @@ EXTENDED_SCRIPTS = [
'rpcbind_test.py',
# vv Tests less than 30s vv
'assumevalid.py',
- 'bip65-cltv.py',
- 'bip65-cltv-p2p.py',
'bipdersig-p2p.py',
'bipdersig.py',
'example_test.py',