mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-29 04:27:30 -03:00
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
81 lines
2.6 KiB
C++
81 lines
2.6 KiB
C++
// Copyright (c) 2018-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 <boost/test/unit_test.hpp>
|
|
|
|
#include <noui.h>
|
|
#include <test/setup_common.h>
|
|
#include <util/system.h>
|
|
#include <wallet/test/init_test_fixture.h>
|
|
|
|
BOOST_FIXTURE_TEST_SUITE(init_tests, InitWalletDirTestingSetup)
|
|
|
|
BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_default)
|
|
{
|
|
SetWalletDir(m_walletdir_path_cases["default"]);
|
|
bool result = m_chain_client->verify();
|
|
BOOST_CHECK(result == true);
|
|
fs::path walletdir = gArgs.GetArg("-walletdir", "");
|
|
fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
|
|
BOOST_CHECK(walletdir == expected_path);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_custom)
|
|
{
|
|
SetWalletDir(m_walletdir_path_cases["custom"]);
|
|
bool result = m_chain_client->verify();
|
|
BOOST_CHECK(result == true);
|
|
fs::path walletdir = gArgs.GetArg("-walletdir", "");
|
|
fs::path expected_path = fs::canonical(m_walletdir_path_cases["custom"]);
|
|
BOOST_CHECK(walletdir == expected_path);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_does_not_exist)
|
|
{
|
|
SetWalletDir(m_walletdir_path_cases["nonexistent"]);
|
|
noui_suppress();
|
|
bool result = m_chain_client->verify();
|
|
noui_reconnect();
|
|
BOOST_CHECK(result == false);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_is_not_directory)
|
|
{
|
|
SetWalletDir(m_walletdir_path_cases["file"]);
|
|
noui_suppress();
|
|
bool result = m_chain_client->verify();
|
|
noui_reconnect();
|
|
BOOST_CHECK(result == false);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_is_not_relative)
|
|
{
|
|
SetWalletDir(m_walletdir_path_cases["relative"]);
|
|
noui_suppress();
|
|
bool result = m_chain_client->verify();
|
|
noui_reconnect();
|
|
BOOST_CHECK(result == false);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_no_trailing)
|
|
{
|
|
SetWalletDir(m_walletdir_path_cases["trailing"]);
|
|
bool result = m_chain_client->verify();
|
|
BOOST_CHECK(result == true);
|
|
fs::path walletdir = gArgs.GetArg("-walletdir", "");
|
|
fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
|
|
BOOST_CHECK(walletdir == expected_path);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_no_trailing2)
|
|
{
|
|
SetWalletDir(m_walletdir_path_cases["trailing2"]);
|
|
bool result = m_chain_client->verify();
|
|
BOOST_CHECK(result == true);
|
|
fs::path walletdir = gArgs.GetArg("-walletdir", "");
|
|
fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
|
|
BOOST_CHECK(walletdir == expected_path);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_SUITE_END()
|