diff options
author | rfree2monero <rfreemonero@op.pl> | 2015-04-10 16:13:57 +0200 |
---|---|---|
committer | rfree2 <rfree@op.pl> | 2015-04-10 16:54:21 +0200 |
commit | 32c19c6c3d677564d217ba31c16fdfc84b4faf80 (patch) | |
tree | 04ff7dcf43840494a356485a9f377aab14212e56 /tests | |
parent | Merge pull request #259 (diff) | |
download | monero-32c19c6c3d677564d217ba31c16fdfc84b4faf80.tar.xz |
[fix] log level change. compilation: dns, tests
old unbound #warning does not block compilation
unit tests build fine. Even though the RPC/P2P network type is required again
Diffstat (limited to 'tests')
-rw-r--r-- | tests/core_proxy/core_proxy.h | 1 | ||||
-rw-r--r-- | tests/net_load_tests/clt.cpp | 7 | ||||
-rw-r--r-- | tests/net_load_tests/srv.cpp | 2 | ||||
-rw-r--r-- | tests/unit_tests/epee_boosted_tcp_server.cpp | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h index b40c5b216..09582da40 100644 --- a/tests/core_proxy/core_proxy.h +++ b/tests/core_proxy/core_proxy.h @@ -34,6 +34,7 @@ #include "cryptonote_core/cryptonote_basic_impl.h" #include "cryptonote_core/verification_context.h" +#include "cryptonote_core/blockchain_storage.h" #include <unordered_map> namespace tests diff --git a/tests/net_load_tests/clt.cpp b/tests/net_load_tests/clt.cpp index 6307f18eb..95702e1a8 100644 --- a/tests/net_load_tests/clt.cpp +++ b/tests/net_load_tests/clt.cpp @@ -186,6 +186,11 @@ namespace class net_load_test_clt : public ::testing::Test { + public: + net_load_test_clt() + : m_tcp_server(epee::net_utils::e_connection_type_RPC) // RPC disables network limit for unit tests + { + } protected: virtual void SetUp() { @@ -237,7 +242,7 @@ namespace { // Stop server test_levin_commands_handler commands_handler; - test_tcp_server tcp_server; + test_tcp_server tcp_server(epee::net_utils::e_connection_type_NET); tcp_server.get_config_object().m_pcommands_handler = &commands_handler; tcp_server.get_config_object().m_invoke_timeout = CONNECTION_TIMEOUT; diff --git a/tests/net_load_tests/srv.cpp b/tests/net_load_tests/srv.cpp index 582c9efdf..12b0e46c8 100644 --- a/tests/net_load_tests/srv.cpp +++ b/tests/net_load_tests/srv.cpp @@ -223,7 +223,7 @@ int main(int argc, char** argv) size_t thread_count = (std::max)(min_thread_count, std::thread::hardware_concurrency() / 2); - test_tcp_server tcp_server; + test_tcp_server tcp_server(epee::net_utils::e_connection_type_RPC); if (!tcp_server.init_server(srv_port, "127.0.0.1")) return 1; diff --git a/tests/unit_tests/epee_boosted_tcp_server.cpp b/tests/unit_tests/epee_boosted_tcp_server.cpp index e0eddf672..bdeaa2bde 100644 --- a/tests/unit_tests/epee_boosted_tcp_server.cpp +++ b/tests/unit_tests/epee_boosted_tcp_server.cpp @@ -85,7 +85,7 @@ namespace TEST(boosted_tcp_server, worker_threads_are_exception_resistant) { - test_tcp_server srv; + test_tcp_server srv(epee::net_utils::e_connection_type_RPC); // RPC disables network limit for unit tests ASSERT_TRUE(srv.init_server(test_server_port, test_server_host)); std::mutex mtx; |