merged test fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-07-29 08:20:16 +00:00
parent e43407778d
commit 0465d6325d
1 changed files with 2 additions and 7 deletions

View File

@ -68,7 +68,7 @@ void display_pe_settings(libtorrent::pe_settings s)
void test_transfer(libtorrent::pe_settings::enc_policy policy,
libtorrent::pe_settings::enc_level level = libtorrent::pe_settings::both,
bool pref_rc4 = false, bool encrypted_torrent = false)
bool pref_rc4 = false)
{
using namespace libtorrent;
@ -100,7 +100,7 @@ void test_transfer(libtorrent::pe_settings::enc_policy policy,
using boost::tuples::ignore;
boost::tie(tor1, tor2, ignore) = setup_transfer(&ses1, &ses2, 0, true, false, true
, "_pe", 16 * 1024, 0, false, 0, true, encrypted_torrent);
, "_pe", 16 * 1024, 0, false, 0, true);
fprintf(stderr, "waiting for transfer to complete\n");
@ -196,11 +196,6 @@ int test_main()
test_enc_handler(&aes1, &aes2);
#endif
test_transfer(pe_settings::enabled, pe_settings::both, false, true);
test_transfer(pe_settings::enabled, pe_settings::both, true, true);
return 0;
test_transfer(pe_settings::disabled);
test_transfer(pe_settings::forced, pe_settings::plaintext);