LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

util_SettingsMerge test cleanup

Browse source 
Followup to #15869. Treat "-wallet" as the network-specific argument in test
instead of "-server", to make test output clearer and be more consistent with
bitcoind. Update embedded hash to match changed output from this.
This commit is contained in:
Russell Yanofsky 2019-04-24 05:57:34 -04:00
parent b2a6b02161
commit 05bfee3451
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/test/util_tests.cpp
View file

@ -580,7 +580,7 @@ BOOST_AUTO_TEST_CASE(util_GetChainName)
// Test different ways settings can be merged, and verify results. This test can // Test different ways settings can be merged, and verify results. This test can
// be used to confirm that updates to settings code don't change behavior // be used to confirm that updates to settings code don't change behavior
// unintentially. // unintentionally.
// //
// The test covers: // The test covers:
// //
@ -687,7 +687,7 @@ struct SettingsMergeTestingSetup : public BasicTestingSetup {
// Regression test covering different ways config settings can be merged. The // Regression test covering different ways config settings can be merged. The
// test parses and merges settings, representing the results as strings that get // test parses and merges settings, representing the results as strings that get
// compared against an expected hash. To debug, the result strings can be dumped // compared against an expected hash. To debug, the result strings can be dumped
// to a file (see below). // to a file (see comments below).
BOOST_FIXTURE_TEST_CASE(util_SettingsMerge, SettingsMergeTestingSetup) BOOST_FIXTURE_TEST_CASE(util_SettingsMerge, SettingsMergeTestingSetup)
{ {
CHash256 out_sha; CHash256 out_sha;
@ -706,7 +706,7 @@ BOOST_FIXTURE_TEST_CASE(util_SettingsMerge, SettingsMergeTestingSetup)
desc += network; desc += network;
parser.m_network = network; parser.m_network = network;
const std::string& name = net_specific ? "server" : "wallet"; const std::string& name = net_specific ? "wallet" : "server";
const std::string key = "-" + name; const std::string key = "-" + name;
parser.AddArg(key, name, false, OptionsCategory::OPTIONS); parser.AddArg(key, name, false, OptionsCategory::OPTIONS);
if (net_specific) parser.SetNetworkOnlyArg(key); if (net_specific) parser.SetNetworkOnlyArg(key);
@ -801,7 +801,7 @@ BOOST_FIXTURE_TEST_CASE(util_SettingsMerge, SettingsMergeTestingSetup)
// Results file is formatted like: // Results file is formatted like:
// //
// <input> || <IsArgSet/IsArgNegated/GetArg output> | <GetArgs output> | <GetUnsuitable output> // <input> || <IsArgSet/IsArgNegated/GetArg output> | <GetArgs output> | <GetUnsuitable output>
BOOST_CHECK_EQUAL(out_sha_hex, "80964e17fbd3c5569d3c824d032e28e2d319ef57494735b0e76eb7aad9957f2c"); BOOST_CHECK_EQUAL(out_sha_hex, "f4281d9bff4c0b398ff118386e3a40caa6bac7645e17b296d6a10b95bff632ae");
} }
BOOST_AUTO_TEST_CASE(util_FormatMoney) BOOST_AUTO_TEST_CASE(util_FormatMoney)