Add missing newline in util_ChainMerge test #17388

pull ryanofsky wants to merge 1 commits into bitcoin:master from ryanofsky:pr/chainmerge-nl changing 1 files +2 −1
  1. ryanofsky commented at 10:31 PM on November 5, 2019: member

    This was causing a lot of test cases not not be very meaningful because multiple configuration options were combined into one line.

    The changes in test output with this fix make sense and look like:

    - testnet=1 regtest=1 || test
    + testnet=1 regtest=1 || error: Invalid combination of -regtest, -testnet and -chain. Can use at most one.
    

    Issue was reported and debugged by Wladimir J. van der Laan laanwj@protonmail.com in #17385 (comment)

    <!-- *** Please remove the following help text before submitting: *** Pull requests without a rationale and clear improvement may be closed immediately. -->

    <!-- Please provide clear motivation for your patch and explain how it improves Bitcoin Core user experience or Bitcoin Core developer experience significantly: * Any test improvements or new tests that improve coverage are always welcome. * All other changes should have accompanying unit tests (see `src/test/`) or functional tests (see `test/`). Contributors should note which tests cover modified code. If no tests exist for a region of modified code, new tests should accompany the change. * Bug fixes are most welcome when they come with steps to reproduce or an explanation of the potential issue as well as reasoning for the way the bug was fixed. * Features are welcome, but might be rejected due to design or scope issues. If a feature is based on a lot of dependencies, contributors should first consider building the system outside of Bitcoin Core, if possible. * Refactoring changes are only accepted if they are required for a feature or bug fix or otherwise improve developer experience significantly. For example, most "code style" refactoring changes require a thorough explanation why they are useful, what downsides they have and why they *significantly* improve developer experience or avoid serious programming bugs. Note that code style is often a subjective matter. Unless they are explicitly mentioned to be preferred in the [developer notes](/doc/developer-notes.md), stylistic code changes are usually rejected. -->

    <!-- Bitcoin Core has a thorough review process and even the most trivial change needs to pass a lot of eyes and requires non-zero or even substantial time effort to review. There is a huge lack of active reviewers on the project, so patches often sit for a long time. -->

  2. Add missing newline in util_ChainMerge test
    This was causing a lot of test cases not not be very meaningful because
    multiple configuration options were combined into one line.
    
    The changes in test output with this fix make sense and look like:
    
    ```diff
    - testnet=1 regtest=1 || test
    + testnet=1 regtest=1 || error: Invalid combination of -regtest, -testnet and -chain. Can use at most one.
    ```
    
    Issue was reported and debugged by
    Wladimir J. van der Laan <laanwj@protonmail.com> in
    https://github.com/bitcoin/bitcoin/pull/17385#issuecomment-550033222
    3645e4ca00
  3. fanquake added the label Tests on Nov 5, 2019
  4. laanwj commented at 10:41 PM on November 5, 2019: member

    Thanks!

    This shows the differences between the old and new test output : https://gist.github.com/laanwj/f3a436dd1d33d44f5a78d94bfa4ebcdb

    Yes, makes a lot more sense now. ACK 3645e4ca0033bb6365f41ef710111780c139370f

  5. DrahtBot commented at 11:16 PM on November 5, 2019: member

    <!--e57a25ab6845829454e8d69fc972939a-->

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    <!--174a7506f384e20aa4161008e828411d-->

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #16411 (Signet support by kallewoof)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  6. practicalswift commented at 6:52 AM on November 6, 2019: contributor

    ACK 3645e4ca0033bb6365f41ef710111780c139370f -- diff looks correct

  7. laanwj referenced this in commit 224c19645f on Nov 6, 2019
  8. laanwj merged this on Nov 6, 2019
  9. laanwj closed this on Nov 6, 2019

  10. jasonbcox referenced this in commit d811715021 on Nov 4, 2020
  11. MarcoFalke locked this on Dec 16, 2021

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: 2026-04-17 06:14 UTC

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