cleanup test_priority
This commit is contained in:
@@ -215,9 +215,19 @@ void test_transfer()
|
|||||||
std::cerr << "torrent is finished (50% complete)" << std::endl;
|
std::cerr << "torrent is finished (50% complete)" << std::endl;
|
||||||
else return;
|
else return;
|
||||||
|
|
||||||
|
std::vector<int> priorities2 = tor2.piece_priorities();
|
||||||
|
std::copy(priorities2.begin(), priorities2.end(), std::ostream_iterator<int>(std::cerr, ", "));
|
||||||
|
std::cerr << std::endl;
|
||||||
|
TEST_CHECK(std::equal(priorities.begin(), priorities.end(), priorities2.begin()));
|
||||||
|
|
||||||
std::cerr << "force recheck" << std::endl;
|
std::cerr << "force recheck" << std::endl;
|
||||||
tor2.force_recheck();
|
tor2.force_recheck();
|
||||||
|
|
||||||
|
priorities2 = tor2.piece_priorities();
|
||||||
|
std::copy(priorities2.begin(), priorities2.end(), std::ostream_iterator<int>(std::cerr, ", "));
|
||||||
|
std::cerr << std::endl;
|
||||||
|
TEST_CHECK(std::equal(priorities.begin(), priorities.end(), priorities2.begin()));
|
||||||
|
|
||||||
peer_disconnects = 0;
|
peer_disconnects = 0;
|
||||||
|
|
||||||
// wait until force-recheck is complete
|
// wait until force-recheck is complete
|
||||||
@@ -235,7 +245,7 @@ void test_transfer()
|
|||||||
test_sleep(100);
|
test_sleep(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<int> priorities2 = tor2.piece_priorities();
|
priorities2 = tor2.piece_priorities();
|
||||||
TEST_CHECK(std::equal(priorities.begin(), priorities.end(), priorities2.begin()));
|
TEST_CHECK(std::equal(priorities.begin(), priorities.end(), priorities2.begin()));
|
||||||
|
|
||||||
peer_disconnects = 0;
|
peer_disconnects = 0;
|
||||||
@@ -302,7 +312,7 @@ void test_transfer()
|
|||||||
p.flags &= ~add_torrent_params::flag_paused;
|
p.flags &= ~add_torrent_params::flag_paused;
|
||||||
p.flags &= ~add_torrent_params::flag_auto_managed;
|
p.flags &= ~add_torrent_params::flag_auto_managed;
|
||||||
p.ti = t;
|
p.ti = t;
|
||||||
p.save_path = "tmp2_priority_moved";
|
p.save_path = "tmp2_priority";
|
||||||
p.resume_data = resume_data;
|
p.resume_data = resume_data;
|
||||||
tor2 = ses2.add_torrent(p, ec);
|
tor2 = ses2.add_torrent(p, ec);
|
||||||
ses2.set_alert_mask(alert::all_categories
|
ses2.set_alert_mask(alert::all_categories
|
||||||
|
@@ -333,10 +333,10 @@ void test_transfer(int proxy_type, bool test_disk_full = false, bool test_allowe
|
|||||||
|| st2.state == torrent_status::checking_resume_data
|
|| st2.state == torrent_status::checking_resume_data
|
||||||
|| (test_disk_full && !st2.error.empty()));
|
|| (test_disk_full && !st2.error.empty()));
|
||||||
|
|
||||||
if (peer_disconnects >= 2) break;
|
if (!test_disk_full && peer_disconnects >= 2) break;
|
||||||
|
|
||||||
// if nothing is being transferred after 2 seconds, we're failing the test
|
// if nothing is being transferred after 2 seconds, we're failing the test
|
||||||
if (st1.upload_payload_rate == 0 && i > 20) break;
|
// if (!test_disk_full && st1.upload_payload_rate == 0 && i > 20) break;
|
||||||
|
|
||||||
test_sleep(100);
|
test_sleep(100);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user