wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

improve robustness of test_privacy and error messages of test_fast_extension

This commit is contained in:
Arvid Norberg 2014-08-01 05:44:48 +00:00
parent 671ae32ae5
commit c4b2682599
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/test_fast_extension.cpp
View File

@ -52,7 +52,8 @@ int read_message(stream_socket& s, char* buffer)
if (ec) if (ec)
{ {
std::cout << time_now_string() << ": " << ec.message() << std::endl; std::cout << time_now_string() << ": " << ec.message() << std::endl;
exit(1); TEST_ERROR("read_message: " + ec.message());
return 0;
} }
char* ptr = buffer; char* ptr = buffer;
int length = read_int32(ptr); int length = read_int32(ptr);
@ -62,7 +63,8 @@ int read_message(stream_socket& s, char* buffer)
if (ec) if (ec)
{ {
std::cout << time_now_string() << ": " << ec.message() << std::endl; std::cout << time_now_string() << ": " << ec.message() << std::endl;
exit(1); TEST_ERROR("read_message: " + ec.message());
return 0;
} }
return length; return length;
} }

2
test/test_privacy.cpp
View File

@ -104,6 +104,8 @@ session_proxy test_proxy(settings_pack::proxy_type_t proxy_type, int flags)
sett.set_bool(settings_pack::announce_to_all_tiers, true); sett.set_bool(settings_pack::announce_to_all_tiers, true);
sett.set_bool(settings_pack::force_proxy, flags & force_proxy_mode); sett.set_bool(settings_pack::force_proxy, flags & force_proxy_mode);
sett.set_int(settings_pack::alert_mask, alert_mask); sett.set_int(settings_pack::alert_mask, alert_mask);
sett.set_bool(settings_pack::enable_upnp, false);
sett.set_bool(settings_pack::enable_natpmp, false);
// since multiple sessions may exist simultaneously (because of the // since multiple sessions may exist simultaneously (because of the
// pipelining of the tests) they actually need to use different ports // pipelining of the tests) they actually need to use different ports