diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2019-11-05 17:25:16 -0500 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2019-11-05 17:25:16 -0500 |
| commit | 3645e4ca0033bb6365f41ef710111780c139370f (patch) | |
| tree | 13608b6ba99b05dbe1df1ff1eb0b2b581d505af1 /src/test | |
| parent | d9a45500018fa4fd52c9c9326f79521d93d99abb (diff) | |
| download | bitcoin-3645e4ca0033bb6365f41ef710111780c139370f.tar.xz | |
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
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/util_tests.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 569ce53092..6031219adf 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -890,6 +890,7 @@ BOOST_FIXTURE_TEST_CASE(util_ChainMerge, ChainMergeTestingSetup) desc += " "; desc += argstr + 1; conf += argstr + 1; + conf += "\n"; } std::istringstream conf_stream(conf); BOOST_CHECK(parser.ReadConfigStream(conf_stream, "filepath", error)); @@ -928,7 +929,7 @@ BOOST_FIXTURE_TEST_CASE(util_ChainMerge, ChainMergeTestingSetup) // Results file is formatted like: // // <input> || <output> - BOOST_CHECK_EQUAL(out_sha_hex, "94b4ad55c8ac639a56b93e36f7e32e4c611fd7d7dd7b2be6a71707b1eadcaec7"); + BOOST_CHECK_EQUAL(out_sha_hex, "f0b3a3c29869edc765d579c928f7f1690a71fbb673b49ccf39cbc4de18156a0d"); } BOOST_AUTO_TEST_CASE(util_FormatMoney) |