improved tests to be able to run in parallel and added pex test
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
#include <boost/thread.hpp>
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
|
||||
#include "test.hpp"
|
||||
#include "setup_transfer.hpp"
|
||||
@@ -17,21 +18,21 @@ void test_transfer(bool clear_files, bool disconnect
|
||||
{
|
||||
using namespace libtorrent;
|
||||
|
||||
session ses1(fingerprint("LT", 0, 1, 0, 0), std::make_pair(48000, 49000));
|
||||
session ses2(fingerprint("LT", 0, 1, 0, 0), std::make_pair(49000, 50000));
|
||||
session ses1(fingerprint("LT", 0, 1, 0, 0), std::make_pair(48100, 49000));
|
||||
session ses2(fingerprint("LT", 0, 1, 0, 0), std::make_pair(49100, 50000));
|
||||
ses1.add_extension(constructor);
|
||||
ses2.add_extension(constructor);
|
||||
torrent_handle tor1;
|
||||
torrent_handle tor2;
|
||||
#ifndef TORRENT_DISABLE_ENCRYPTION
|
||||
pe_settings pes;
|
||||
pes.out_enc_policy = pe_settings::disabled;
|
||||
pes.in_enc_policy = pe_settings::disabled;
|
||||
pes.out_enc_policy = pe_settings::forced;
|
||||
pes.in_enc_policy = pe_settings::forced;
|
||||
ses1.set_pe_settings(pes);
|
||||
ses2.set_pe_settings(pes);
|
||||
#endif
|
||||
|
||||
boost::tie(tor1, tor2, ignore) = setup_transfer(&ses1, &ses2, 0, clear_files);
|
||||
boost::tie(tor1, tor2, ignore) = setup_transfer(&ses1, &ses2, 0, clear_files, true, true, "_meta");
|
||||
|
||||
for (int i = 0; i < 50; ++i)
|
||||
{
|
||||
@@ -40,12 +41,18 @@ void test_transfer(bool clear_files, bool disconnect
|
||||
if (!disconnect) tor2.status();
|
||||
std::auto_ptr<alert> a;
|
||||
a = ses1.pop_alert();
|
||||
if (a.get())
|
||||
while(a.get())
|
||||
{
|
||||
std::cerr << "ses1: " << a->msg() << "\n";
|
||||
a = ses1.pop_alert();
|
||||
}
|
||||
|
||||
a = ses2.pop_alert();
|
||||
if (a.get())
|
||||
while (a.get())
|
||||
{
|
||||
std::cerr << "ses2: " << a->msg() << "\n";
|
||||
a = ses2.pop_alert();
|
||||
}
|
||||
|
||||
if (disconnect && tor2.is_valid()) ses2.remove_torrent(tor2);
|
||||
if (!disconnect && tor2.has_metadata()) break;
|
||||
@@ -57,15 +64,30 @@ void test_transfer(bool clear_files, bool disconnect
|
||||
TEST_CHECK(tor2.has_metadata());
|
||||
std::cerr << "waiting for transfer to complete\n";
|
||||
|
||||
for (int i = 0; i < 50; ++i)
|
||||
for (int i = 0; i < 30; ++i)
|
||||
{
|
||||
tor2.status();
|
||||
torrent_status st1 = tor1.status();
|
||||
torrent_status st2 = tor2.status();
|
||||
|
||||
std::cerr
|
||||
<< "\033[33m" << int(st1.upload_payload_rate / 1000.f) << "kB/s "
|
||||
<< st1.num_peers << ": "
|
||||
<< "\033[32m" << int(st2.download_payload_rate / 1000.f) << "kB/s "
|
||||
<< "\033[31m" << int(st2.upload_payload_rate / 1000.f) << "kB/s "
|
||||
<< "\033[0m" << int(st2.progress * 100) << "% "
|
||||
<< st2.num_peers
|
||||
<< std::endl;
|
||||
if (tor2.is_seed()) break;
|
||||
test_sleep(100);
|
||||
test_sleep(1000);
|
||||
}
|
||||
|
||||
TEST_CHECK(tor2.is_seed());
|
||||
if (tor2.is_seed()) std::cerr << "done\n";
|
||||
|
||||
using boost::filesystem::remove_all;
|
||||
remove_all("./tmp1_meta");
|
||||
remove_all("./tmp2_meta");
|
||||
remove_all("./tmp3_meta");
|
||||
}
|
||||
|
||||
int test_main()
|
||||
|
Reference in New Issue
Block a user