diff --git a/test/setup_transfer.cpp b/test/setup_transfer.cpp index c5b864aaa..db56a09e1 100644 --- a/test/setup_transfer.cpp +++ b/test/setup_transfer.cpp @@ -74,7 +74,7 @@ void report_failure(char const* err, char const* file, int line) bool print_alerts(libtorrent::session& ses, char const* name , bool allow_disconnects, bool allow_no_torrents, bool allow_failed_fastresume - , bool (*predicate)(libtorrent::alert*)) + , bool (*predicate)(libtorrent::alert*), bool no_output) { bool ret = false; std::vector handles = ses.get_torrents(); @@ -92,10 +92,12 @@ bool print_alerts(libtorrent::session& ses, char const* name } else if ((*i)->message() != "block downloading" && (*i)->message() != "block finished" - && (*i)->message() != "piece finished") + && (*i)->message() != "piece finished" + && !no_output) { fprintf(stderr, "%s: %s\n", name, (*i)->message().c_str()); } + TEST_CHECK(alert_cast(*i) == 0 || allow_failed_fastresume); peer_error_alert* pea = alert_cast(*i); @@ -130,7 +132,7 @@ void wait_for_listen(libtorrent::session& ses, char const* name) alert const* a = 0; do { - print_alerts(ses, name, true, true, true, &listen_alert); + print_alerts(ses, name, true, true, true, &listen_alert, false); if (listen_done) break; a = ses.wait_for_alert(milliseconds(500)); } while (a); diff --git a/test/setup_transfer.hpp b/test/setup_transfer.hpp index a5e236997..eb990fb7a 100644 --- a/test/setup_transfer.hpp +++ b/test/setup_transfer.hpp @@ -46,7 +46,8 @@ bool print_alerts(libtorrent::session& ses, char const* name , bool allow_disconnects = false , bool allow_no_torrents = false , bool allow_failed_fastresume = false - , bool (*)(libtorrent::alert*) = 0); + , bool (*)(libtorrent::alert*) = 0 + , bool no_output = false); void wait_for_listen(libtorrent::session& ses, char const* name); void test_sleep(int millisec); diff --git a/test/test_web_seed.cpp b/test/test_web_seed.cpp index 254fbfa3c..58f6f6924 100644 --- a/test/test_web_seed.cpp +++ b/test/test_web_seed.cpp @@ -118,7 +118,7 @@ void test_transfer(boost::intrusive_ptr torrent_file << " buffers: " << cs.total_used_buffers << std::endl; */ - print_alerts(ses, " >> ses"); + print_alerts(ses, " >> ses", false, false, false, 0, true); if (s.is_seeding /* && ss.download_rate == 0.f*/) {