aboutsummaryrefslogtreecommitdiff
path: root/tests/functional_tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/functional_tests')
-rw-r--r--tests/functional_tests/CMakeLists.txt1
-rw-r--r--tests/functional_tests/main.cpp7
-rw-r--r--tests/functional_tests/transactions_flow_test.cpp16
3 files changed, 11 insertions, 13 deletions
diff --git a/tests/functional_tests/CMakeLists.txt b/tests/functional_tests/CMakeLists.txt
index 7e1845114..233730955 100644
--- a/tests/functional_tests/CMakeLists.txt
+++ b/tests/functional_tests/CMakeLists.txt
@@ -44,6 +44,7 @@ target_link_libraries(functional_tests
wallet
common
crypto
+ epee
${Boost_REGEX_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
diff --git a/tests/functional_tests/main.cpp b/tests/functional_tests/main.cpp
index 58a2a5c90..c0c83c91c 100644
--- a/tests/functional_tests/main.cpp
+++ b/tests/functional_tests/main.cpp
@@ -61,11 +61,8 @@ int main(int argc, char* argv[])
string_tools::set_module_name_and_folder(argv[0]);
//set up logging options
- log_space::get_set_log_detalisation_level(true, LOG_LEVEL_3);
- log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_2);
- log_space::log_singletone::add_logger(LOGGER_FILE,
- log_space::log_singletone::get_default_log_file().c_str(),
- log_space::log_singletone::get_default_log_folder().c_str());
+ mlog_configure(mlog_get_default_log_path("functional_tests.log"), true);
+ mlog_set_log_level(3);
po::options_description desc_options("Allowed options");
command_line::add_arg(desc_options, command_line::arg_help);
diff --git a/tests/functional_tests/transactions_flow_test.cpp b/tests/functional_tests/transactions_flow_test.cpp
index 585328348..73c79c237 100644
--- a/tests/functional_tests/transactions_flow_test.cpp
+++ b/tests/functional_tests/transactions_flow_test.cpp
@@ -151,9 +151,9 @@ bool transactions_flow_test(std::string& working_folder,
w2.init(daemon_addr_b);
- LOG_PRINT_GREEN("Using wallets: " << ENDL
+ MGINFO_GREEN("Using wallets: " << ENDL
<< "Source: " << w1.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_source_wallet << ENDL
- << "Target: " << w2.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_target_wallet, LOG_LEVEL_1);
+ << "Target: " << w2.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_target_wallet);
//lets do some money
epee::net_utils::http::http_simple_client http_client;
@@ -194,7 +194,7 @@ bool transactions_flow_test(std::string& working_folder,
cryptonote::transaction tx_s;
bool r = do_send_money(w1, w1, 0, td.m_tx.vout[td.m_internal_output_index].amount - TEST_FEE, tx_s, 50);
CHECK_AND_ASSERT_MES(r, false, "Failed to send starter tx " << get_transaction_hash(tx_s));
- LOG_PRINT_GREEN("Starter transaction sent " << get_transaction_hash(tx_s), LOG_LEVEL_0);
+ MGINFO_GREEN("Starter transaction sent " << get_transaction_hash(tx_s));
if(++count >= FIRST_N_TRANSFERS)
break;
}
@@ -272,8 +272,8 @@ bool transactions_flow_test(std::string& working_folder,
uint64_t money_2 = w2.balance();
if(money_2 == transfered_money)
{
- LOG_PRINT_GREEN("-----------------------FINISHING TRANSACTIONS FLOW TEST OK-----------------------", LOG_LEVEL_0);
- LOG_PRINT_GREEN("transferred " << print_money(transfered_money) << " via " << i << " transactions" , LOG_LEVEL_0);
+ MGINFO_GREEN("-----------------------FINISHING TRANSACTIONS FLOW TEST OK-----------------------");
+ MGINFO_GREEN("transferred " << print_money(transfered_money) << " via " << i << " transactions" );
return true;
}else
{
@@ -290,13 +290,13 @@ bool transactions_flow_test(std::string& working_folder,
{
if(tx_pair.second.m_received_count != 1)
{
- LOG_PRINT_RED_L0("Transaction lost: " << get_transaction_hash(tx_pair.second.tx));
+ MERROR("Transaction lost: " << get_transaction_hash(tx_pair.second.tx));
}
}
- LOG_PRINT_RED_L0("-----------------------FINISHING TRANSACTIONS FLOW TEST FAILED-----------------------" );
- LOG_PRINT_RED_L0("income " << print_money(money_2) << " via " << i << " transactions, expected money = " << print_money(transfered_money) );
+ MERROR("-----------------------FINISHING TRANSACTIONS FLOW TEST FAILED-----------------------" );
+ MERROR("income " << print_money(money_2) << " via " << i << " transactions, expected money = " << print_money(transfered_money) );
LOCAL_ASSERT(false);
return false;
}