mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-05-15 20:50:41 +02:00
[util] add RunCommandParseJSON
This commit is contained in:
parent
c17f54ee53
commit
31cf68a3ad
@ -265,6 +265,7 @@ BITCOIN_TESTS =\
|
|||||||
test/skiplist_tests.cpp \
|
test/skiplist_tests.cpp \
|
||||||
test/streams_tests.cpp \
|
test/streams_tests.cpp \
|
||||||
test/sync_tests.cpp \
|
test/sync_tests.cpp \
|
||||||
|
test/system_tests.cpp \
|
||||||
test/util_threadnames_tests.cpp \
|
test/util_threadnames_tests.cpp \
|
||||||
test/timedata_tests.cpp \
|
test/timedata_tests.cpp \
|
||||||
test/torcontrol_tests.cpp \
|
test/torcontrol_tests.cpp \
|
||||||
|
95
src/test/system_tests.cpp
Normal file
95
src/test/system_tests.cpp
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
// Copyright (c) 2019 The Bitcoin Core developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
//
|
||||||
|
#include <test/util/setup_common.h>
|
||||||
|
#include <util/system.h>
|
||||||
|
#include <univalue.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_BOOST_PROCESS
|
||||||
|
#include <boost/process.hpp>
|
||||||
|
#endif // HAVE_BOOST_PROCESS
|
||||||
|
|
||||||
|
#include <boost/test/unit_test.hpp>
|
||||||
|
|
||||||
|
BOOST_FIXTURE_TEST_SUITE(system_tests, BasicTestingSetup)
|
||||||
|
|
||||||
|
// At least one test is required (in case HAVE_BOOST_PROCESS is not defined).
|
||||||
|
// Workaround for https://github.com/bitcoin/bitcoin/issues/19128
|
||||||
|
BOOST_AUTO_TEST_CASE(dummy)
|
||||||
|
{
|
||||||
|
BOOST_CHECK(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_BOOST_PROCESS
|
||||||
|
|
||||||
|
bool checkMessage(const std::runtime_error& ex)
|
||||||
|
{
|
||||||
|
// On Linux & Mac: "No such file or directory"
|
||||||
|
// On Windows: "The system cannot find the file specified."
|
||||||
|
const std::string what(ex.what());
|
||||||
|
BOOST_CHECK(what.find("file") != std::string::npos);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool checkMessageFalse(const std::runtime_error& ex)
|
||||||
|
{
|
||||||
|
BOOST_CHECK_EQUAL(ex.what(), std::string("RunCommandParseJSON error: process(false) returned 1: \n"));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool checkMessageStdErr(const std::runtime_error& ex)
|
||||||
|
{
|
||||||
|
const std::string what(ex.what());
|
||||||
|
BOOST_CHECK(what.find("RunCommandParseJSON error:") != std::string::npos);
|
||||||
|
return checkMessage(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(run_command)
|
||||||
|
{
|
||||||
|
{
|
||||||
|
const UniValue result = RunCommandParseJSON("");
|
||||||
|
BOOST_CHECK(result.isNull());
|
||||||
|
}
|
||||||
|
{
|
||||||
|
#ifdef WIN32
|
||||||
|
// Windows requires single quotes to prevent escaping double quotes from the JSON...
|
||||||
|
const UniValue result = RunCommandParseJSON("echo '{\"success\": true}'");
|
||||||
|
#else
|
||||||
|
// ... but Linux and macOS echo a single quote if it's used
|
||||||
|
const UniValue result = RunCommandParseJSON("echo \"{\"success\": true}\"");
|
||||||
|
#endif
|
||||||
|
BOOST_CHECK(result.isObject());
|
||||||
|
const UniValue& success = find_value(result, "success");
|
||||||
|
BOOST_CHECK(!success.isNull());
|
||||||
|
BOOST_CHECK_EQUAL(success.getBool(), true);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
// An invalid command is handled by Boost
|
||||||
|
BOOST_CHECK_EXCEPTION(RunCommandParseJSON("invalid_command"), boost::process::process_error, checkMessage); // Command failed
|
||||||
|
}
|
||||||
|
{
|
||||||
|
// Return non-zero exit code, no output to stderr
|
||||||
|
BOOST_CHECK_EXCEPTION(RunCommandParseJSON("false"), std::runtime_error, checkMessageFalse);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
// Return non-zero exit code, with error message for stderr
|
||||||
|
BOOST_CHECK_EXCEPTION(RunCommandParseJSON("ls nosuchfile"), std::runtime_error, checkMessageStdErr);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
BOOST_REQUIRE_THROW(RunCommandParseJSON("echo \"{\""), std::runtime_error); // Unable to parse JSON
|
||||||
|
}
|
||||||
|
// Test std::in, except for Windows
|
||||||
|
#ifndef WIN32
|
||||||
|
{
|
||||||
|
const UniValue result = RunCommandParseJSON("cat", "{\"success\": true}");
|
||||||
|
BOOST_CHECK(result.isObject());
|
||||||
|
const UniValue& success = find_value(result, "success");
|
||||||
|
BOOST_CHECK(!success.isNull());
|
||||||
|
BOOST_CHECK_EQUAL(success.getBool(), true);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif // HAVE_BOOST_PROCESS
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_SUITE_END()
|
@ -6,6 +6,10 @@
|
|||||||
#include <sync.h>
|
#include <sync.h>
|
||||||
#include <util/system.h>
|
#include <util/system.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_BOOST_PROCESS
|
||||||
|
#include <boost/process.hpp>
|
||||||
|
#endif // HAVE_BOOST_PROCESS
|
||||||
|
|
||||||
#include <chainparamsbase.h>
|
#include <chainparamsbase.h>
|
||||||
#include <util/strencodings.h>
|
#include <util/strencodings.h>
|
||||||
#include <util/string.h>
|
#include <util/string.h>
|
||||||
@ -1161,6 +1165,43 @@ void runCommand(const std::string& strCommand)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_BOOST_PROCESS
|
||||||
|
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
|
||||||
|
{
|
||||||
|
namespace bp = boost::process;
|
||||||
|
|
||||||
|
UniValue result_json;
|
||||||
|
bp::opstream stdin_stream;
|
||||||
|
bp::ipstream stdout_stream;
|
||||||
|
bp::ipstream stderr_stream;
|
||||||
|
|
||||||
|
if (str_command.empty()) return UniValue::VNULL;
|
||||||
|
|
||||||
|
bp::child c(
|
||||||
|
str_command,
|
||||||
|
bp::std_out > stdout_stream,
|
||||||
|
bp::std_err > stderr_stream,
|
||||||
|
bp::std_in < stdin_stream
|
||||||
|
);
|
||||||
|
if (!str_std_in.empty()) {
|
||||||
|
stdin_stream << str_std_in << std::endl;
|
||||||
|
}
|
||||||
|
stdin_stream.pipe().close();
|
||||||
|
|
||||||
|
std::string result;
|
||||||
|
std::string error;
|
||||||
|
std::getline(stdout_stream, result);
|
||||||
|
std::getline(stderr_stream, error);
|
||||||
|
|
||||||
|
c.wait();
|
||||||
|
const int n_error = c.exit_code();
|
||||||
|
if (n_error) throw std::runtime_error(strprintf("RunCommandParseJSON error: process(%s) returned %d: %s\n", str_command, n_error, error));
|
||||||
|
if (!result_json.read(result)) throw std::runtime_error("Unable to parse JSON: " + result);
|
||||||
|
|
||||||
|
return result_json;
|
||||||
|
}
|
||||||
|
#endif // HAVE_BOOST_PROCESS
|
||||||
|
|
||||||
void SetupEnvironment()
|
void SetupEnvironment()
|
||||||
{
|
{
|
||||||
#ifdef HAVE_MALLOPT_ARENA_MAX
|
#ifdef HAVE_MALLOPT_ARENA_MAX
|
||||||
|
@ -37,6 +37,8 @@
|
|||||||
|
|
||||||
#include <boost/thread/condition_variable.hpp> // for boost::thread_interrupted
|
#include <boost/thread/condition_variable.hpp> // for boost::thread_interrupted
|
||||||
|
|
||||||
|
class UniValue;
|
||||||
|
|
||||||
// Application startup time (used for uptime calculation)
|
// Application startup time (used for uptime calculation)
|
||||||
int64_t GetStartupTime();
|
int64_t GetStartupTime();
|
||||||
|
|
||||||
@ -96,6 +98,16 @@ std::string ShellEscape(const std::string& arg);
|
|||||||
#if HAVE_SYSTEM
|
#if HAVE_SYSTEM
|
||||||
void runCommand(const std::string& strCommand);
|
void runCommand(const std::string& strCommand);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef HAVE_BOOST_PROCESS
|
||||||
|
/**
|
||||||
|
* Execute a command which returns JSON, and parse the result.
|
||||||
|
*
|
||||||
|
* @param str_command The command to execute, including any arguments
|
||||||
|
* @param str_std_in string to pass to stdin
|
||||||
|
* @return parsed JSON
|
||||||
|
*/
|
||||||
|
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
|
||||||
|
#endif // HAVE_BOOST_PROCESS
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Most paths passed as configuration arguments are treated as relative to
|
* Most paths passed as configuration arguments are treated as relative to
|
||||||
|
Loading…
Reference in New Issue
Block a user