diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-08-08 23:02:35 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-08-08 23:04:03 +0200 |
| commit | 929fd7276c0f0c30b9416f61a6f5f35d763d81e4 (patch) | |
| tree | 7a2acd38bdc4b32e480127081a31c4168a0785d1 /test/functional/test_runner.py | |
| parent | 2507fd55568b361080e9127f40584af2df64f76e (diff) | |
| parent | 4ccc12a54a217892bd4ccfd94c46052a11cdb3fb (diff) | |
Merge #10695: [qa] Rewrite BIP65/BIP66 functional tests
4ccc12a54 [qa] Rewrite BIP66 functional tests (Suhas Daftuar)
d4f0d87b6 [qa] Rewrite BIP65 functional tests (Suhas Daftuar)
Pull request description:
After 122786d0e0170c73536360b705af711e1338adbf, BIP65 and BIP66 activate at
particular fixed heights (without regard to version numbers of blocks
below those heights). Rewrite the functional tests to take
this into account, and remove two tests that weren't really testing anything.
Moves the rewritten functional tests out of the extended test suite, so that they run in travis regularly.
Note: I discovered that the ComparisonTestFramework (which the original versions of these p2p tests were written is, has a bug that caused them to not catch obvious errors, eg if you just comment out setting the script flags for these softforks in ConnectBlock, the versions of these tests in master do not fail(!) -- will separately PR a fix for the comparison test framework).
Tree-SHA512: 2108b79951f2e980854d0d14ccc0fd1810a43dd4251fd6e3b203e7f104ea55e00650bb1a60a28c2801b4249f46563a8559ac3e3cd39db220914acfed0b3b163d
Diffstat (limited to 'test/functional/test_runner.py')
| -rwxr-xr-x | test/functional/test_runner.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index a043560ea8..dfd3b89895 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -115,6 +115,8 @@ BASE_SCRIPTS= [ 'listsinceblock.py', 'p2p-leaktests.py', 'wallet-encryption.py', + 'bipdersig-p2p.py', + 'bip65-cltv-p2p.py', 'uptime.py', ] @@ -138,10 +140,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', 'txn_doublespend.py', 'txn_clone.py --mineblock', |