e653eeff76
7a0c224289Suppress output in test_bitcoin for expected errors (Gert-Jaap Glasbergen) Pull request description: Closes #15944 This adds two methods to noui, that allows temporarily suppressing (and then resuming) the output from `noui`. For situations where errors are expected, it's confusing for the test binary to output an error and then conclude with `No errors detected`. It also uses this supress/reconnect in the tests that currently produce verbose errors when running `test_bitcoin`. Output of `test_bitcoin` on current master: ``` gertjaap@gjdesktop:~/src/bitcoin$ src/test/test_bitcoin Running 351 test cases... Error: Specified -walletdir "/tmp/test_common_Bitcoin Core/1561389554_943311758/tempdir/path_does_not_exist" does not exist Error: Specified -walletdir "/tmp/test_common_Bitcoin Core/1561389554_643733972/tempdir/not_a_directory.dat" is not a directory Error: Specified -walletdir "wallets" is a relative path *** No errors detected ``` Output after this code is merged: ``` gertjaap@gjdesktop:~/src/bitcoin$ src/test/test_bitcoin Running 351 test cases... *** No errors detected ``` ACKs for top commit: l2a5b1: ACK7a0c224- tested and reviewed. laanwj: ACK7a0c224289Tree-SHA512: c7881f7a431a065329360ffa9937ce4742694c646c90c019d3aff95dfd7fccbdcda9116c5762feb6dfd1108d14f9fb386e203b173c4bde9093afb2b8c977d13d
101 lines
No EOL
3.3 KiB
C++
101 lines
No EOL
3.3 KiB
C++
// Copyright (c) 2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-2018 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 <noui.h>
|
|
|
|
#include <ui_interface.h>
|
|
#include <util/system.h>
|
|
|
|
#include <cstdio>
|
|
#include <stdint.h>
|
|
#include <string>
|
|
|
|
#include <boost/signals2/connection.hpp>
|
|
#include <boost/signals2/signal.hpp>
|
|
|
|
/** Store connections so we can disconnect them when suppressing output */
|
|
boost::signals2::connection noui_ThreadSafeMessageBoxConn;
|
|
boost::signals2::connection noui_ThreadSafeQuestionConn;
|
|
boost::signals2::connection noui_InitMessageConn;
|
|
|
|
bool noui_ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
bool fSecure = style & CClientUIInterface::SECURE;
|
|
style &= ~CClientUIInterface::SECURE;
|
|
bool prefix = !(style & CClientUIInterface::MSG_NOPREFIX);
|
|
style &= ~CClientUIInterface::MSG_NOPREFIX;
|
|
|
|
std::string strCaption;
|
|
if (prefix) {
|
|
switch (style) {
|
|
case CClientUIInterface::MSG_ERROR:
|
|
strCaption = "Error: ";
|
|
break;
|
|
case CClientUIInterface::MSG_WARNING:
|
|
strCaption = "Warning: ";
|
|
break;
|
|
case CClientUIInterface::MSG_INFORMATION:
|
|
strCaption = "Information: ";
|
|
break;
|
|
default:
|
|
strCaption = caption + ": "; // Use supplied caption (can be empty)
|
|
}
|
|
}
|
|
|
|
if (!fSecure) {
|
|
LogPrintf("%s%s\n", strCaption, message);
|
|
}
|
|
tfm::format(std::cerr, "%s%s\n", strCaption.c_str(), message.c_str());
|
|
return false;
|
|
}
|
|
|
|
bool noui_ThreadSafeQuestion(const std::string& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
return noui_ThreadSafeMessageBox(message, caption, style);
|
|
}
|
|
|
|
void noui_InitMessage(const std::string& message)
|
|
{
|
|
LogPrintf("init message: %s\n", message);
|
|
}
|
|
|
|
void noui_connect()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox);
|
|
noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion);
|
|
noui_InitMessageConn = uiInterface.InitMessage_connect(noui_InitMessage);
|
|
}
|
|
|
|
bool noui_ThreadSafeMessageBoxSuppressed(const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool noui_ThreadSafeQuestionSuppressed(const std::string& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
void noui_InitMessageSuppressed(const std::string& message)
|
|
{
|
|
}
|
|
|
|
void noui_suppress()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn.disconnect();
|
|
noui_ThreadSafeQuestionConn.disconnect();
|
|
noui_InitMessageConn.disconnect();
|
|
noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBoxSuppressed);
|
|
noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestionSuppressed);
|
|
noui_InitMessageConn = uiInterface.InitMessage_connect(noui_InitMessageSuppressed);
|
|
}
|
|
|
|
void noui_reconnect()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn.disconnect();
|
|
noui_ThreadSafeQuestionConn.disconnect();
|
|
noui_InitMessageConn.disconnect();
|
|
noui_connect();
|
|
} |