From 0465d6325db1ebeec1dccea48f5ab74503edb344 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 29 Jul 2013 08:20:16 +0000 Subject: [PATCH] merged test fix from RC_0_16 --- test/test_pe_crypto.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/test_pe_crypto.cpp b/test/test_pe_crypto.cpp index 03817bc26..a9531256c 100644 --- a/test/test_pe_crypto.cpp +++ b/test/test_pe_crypto.cpp @@ -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);