[0.12 backport] script_tests improvements from master and #7818 #7854

pull sipa wants to merge 8 commits into bitcoin:0.12 from sipa:refactorscriptests_12 changing 6 files +2193 −2057
  1. sipa commented at 3:42 pm on April 10, 2016: member
    Assuming #7818 gets merged, here is a backport to 0.12, to unify the framework across branches.
  2. test: Re-introduce JSON pretty printing in test builder 04325178f0
  3. test: Script_error checking in script_invalid tests
    Check the returned script_error. Add expected script_error
    for generated as well as custom tests.
    
    The specific error is not part of consensus, however
    it could avoid unclear reporting issues such as #6862 in the future.
    
    Fixes #7513.
    19398b9467
  4. Fix JSON pretty printing in script_tests c9a31324ca
  5. Fix some misconstructed tests
    They claimed to be testing P2SH scripts with non-push scriptSigs, but
    1) they were not enabling P2SH
    2) they have push-only scriptSigs
    
    Fix this, and add a few more related cases.
    6d8e8fe621
  6. Fix formatting of NOPs for generated script tests 1d96f5b4e1
  7. Make script_error a mandatory 4th field for script_tests 1bc3717c7e
  8. Get rid of expect in script_tests as it's implied by scripterror bc17838348
  9. Merge script_valid and script_invalid tests 0695ea1e8c
  10. sipa renamed this:
    [0.12 backport] Various script_tests improvements from master and #7818
    [0.12 backport] script_tests improvements from master and #7818
    on Apr 10, 2016
  11. laanwj added the label Tests on Apr 11, 2016
  12. laanwj commented at 10:59 am on April 11, 2016: member
    I was about to ask how this integrates with “[0.12.2] qa Backports #7811” but this is different. In case anyone wonders: that pull backports functional tests, this pull backports unit tests, so there should be no overlap.
  13. laanwj added this to the milestone 0.12.0 on Apr 11, 2016
  14. MarcoFalke commented at 8:37 am on April 12, 2016: member

    Nit: I’d prefer if you used git cherry-pick -x $HASH instead, so it is clear that those are backports.

    Edit: I think the syntax @laanwj prefers in the commit body of the backport commit is:

    0Github-Pull: [#1234](/bitcoin-bitcoin/1234/)
    1Rebased-From: aaaaaa, bbbbbb
    
  15. laanwj commented at 6:32 am on April 15, 2016: member
    Right - the idea behind those “footers” in the commit message is to be able to instantly see what pull request / master commit(s) a commit came from. The scripting to create the list of pulls in the release notes makes use of this.
  16. laanwj commented at 1:53 pm on May 31, 2016: member
    Closing as #8001 was merged.
  17. laanwj closed this on May 31, 2016

  18. MarcoFalke locked this on Sep 8, 2021


sipa laanwj MarcoFalke

Labels
Tests

Milestone
0.12.0


github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2025-07-09 09:13 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me