diff options
| author | Dusan Klinec <dusan.klinec@gmail.com> | 2019-04-03 21:29:35 +0200 |
|---|---|---|
| committer | Dusan Klinec <dusan.klinec@gmail.com> | 2019-04-10 17:00:12 +0200 |
| commit | c97a1f79d6be190b9952f47e28be2c5d16b154b6 (patch) | |
| tree | aba241eb54ae973fd3c351f53be81423abd80f31 /tests/trezor/daemon.cpp | |
| parent | Merge pull request #5390 (diff) | |
| download | monero-c97a1f79d6be190b9952f47e28be2c5d16b154b6.tar.xz | |
tests: trezor tests fixes and improvements
- configurable hardforks via env vars
Diffstat (limited to 'tests/trezor/daemon.cpp')
| -rw-r--r-- | tests/trezor/daemon.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/trezor/daemon.cpp b/tests/trezor/daemon.cpp index 5e987793a..41af93f3f 100644 --- a/tests/trezor/daemon.cpp +++ b/tests/trezor/daemon.cpp @@ -101,6 +101,9 @@ void mock_daemon::load_params(boost::program_options::variables_map const & vm) mock_daemon::~mock_daemon() { + if(m_http_client.is_connected()) + m_http_client.disconnect(); + if (!m_terminated) { try @@ -134,11 +137,14 @@ void mock_daemon::init() if(m_http_client.is_connected()) m_http_client.disconnect(); - CHECK_AND_ASSERT_THROW_MES(m_http_client.set_server(rpc_addr(), boost::none), "RPC client init fail"); + CHECK_AND_ASSERT_THROW_MES(m_http_client.set_server(rpc_addr(), boost::none, epee::net_utils::ssl_support_t::e_ssl_support_disabled), "RPC client init fail"); } void mock_daemon::deinit() { + if(m_http_client.is_connected()) + m_http_client.disconnect(); + try { m_rpc_server.deinit(); |