Skip to content

Commit

Permalink
Merge bitcoin#26473: test: Avoid collision with valid path names in `…
Browse files Browse the repository at this point in the history
…getarg_tests/logargs`

c8f9147 test: Avoid collision with valid path names in `getarg_tests/logargs` (Hennadii Stepanov)

Pull request description:

  This PR prevents test failure when "private" is a part of a valid path.

  For example, `/private/var` is a valid path on macOS for temporary files, which in turn causes test failure on CI for tests managed by the [CTest](bitcoin#25797) framework.

ACKs for top commit:
  MarcoFalke:
    ACK c8f9147

Tree-SHA512: 09d257f8fa6be903ec8092b2ae92887a4bec2d05085c76c110637657f4a4bfe2714bf87e2e4727719b3624c8fa4c835ce2ca259c2c9c93033837f997b2057e4f
  • Loading branch information
MacroFake authored and PastaPastaPasta committed Feb 13, 2025
1 parent d8f5ab2 commit fb9b5fb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/test/getarg_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ BOOST_AUTO_TEST_CASE(logargs)
const auto okaylog = std::make_pair("-okaylog", ArgsManager::ALLOW_ANY);
const auto dontlog = std::make_pair("-dontlog", ArgsManager::ALLOW_ANY | ArgsManager::SENSITIVE);
SetupArgs(local_args, {okaylog_bool, okaylog_negbool, okaylog, dontlog});
ResetArgs(local_args, "-okaylog-bool -nookaylog-negbool -okaylog=public -dontlog=private");
ResetArgs(local_args, "-okaylog-bool -nookaylog-negbool -okaylog=public -dontlog=private42");

// Everything logged to debug.log will also append to str
std::string str;
Expand All @@ -447,7 +447,7 @@ BOOST_AUTO_TEST_CASE(logargs)
BOOST_CHECK(str.find("Command-line arg: okaylog-negbool=false") != std::string::npos);
BOOST_CHECK(str.find("Command-line arg: okaylog=\"public\"") != std::string::npos);
BOOST_CHECK(str.find("dontlog=****") != std::string::npos);
BOOST_CHECK(str.find("private") == std::string::npos);
BOOST_CHECK(str.find("private42") == std::string::npos);
}

BOOST_AUTO_TEST_SUITE_END()

0 comments on commit fb9b5fb

Please sign in to comment.