diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-11-12 14:13:00 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-11-12 14:13:00 +0000 |
| commit | aef50efed072fd7bbbcceae8fdfde7f0570a1a40 (patch) | |
| tree | a5848d2943968c578790ddf05eb2b20f3c1fa73e /test/AnnounceListTest.cc | |
| parent | 7c41d11be325a2f85108a28a2111353ad0e208b4 (diff) | |
2007-11-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Do not rotate tiers in announce-list.
* src/DefaultBtAnnounce.{h, cc}: Removed trackerNumTry.
AnnounceList::allTiersFailed() used instead to detect whether
all
tiers are tried and failed.
* test/DefaultBtAnnounceTest.cc
* src/AnnounceList.{h, cc}: If all tiers are tried and failed
then
allTiersFailed() returns true. To reset tier pointer, call
resetTier();
* test/AnnounceListTest.cc
* src/TrackerWatcherCommand.cc (execute): Removed DlAbortEx
catch
clause. Catch RecoverableException instead of DlRetryEx instead.
Diffstat (limited to 'test/AnnounceListTest.cc')
| -rw-r--r-- | test/AnnounceListTest.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/test/AnnounceListTest.cc b/test/AnnounceListTest.cc index 56b45cdf..9a5b2e86 100644 --- a/test/AnnounceListTest.cc +++ b/test/AnnounceListTest.cc @@ -44,7 +44,8 @@ void AnnounceListTest::testSingleElementList() { // ANNOUNCE_LIST // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ] AnnounceList announceList(announces); - + + CPPUNIT_ASSERT(!announceList.allTiersFailed()); string url = announceList.getAnnounce(); string event = announceList.getEventString(); CPPUNIT_ASSERT_EQUAL(string("tracker1"), url); @@ -56,6 +57,9 @@ void AnnounceListTest::testSingleElementList() { url = announceList.getAnnounce(); CPPUNIT_ASSERT_EQUAL(string("tracker3"), url); announceList.announceFailure(); + CPPUNIT_ASSERT(announceList.allTiersFailed()); + announceList.resetTier(); + CPPUNIT_ASSERT(!announceList.allTiersFailed()); // back to the first list url = announceList.getAnnounce(); event = announceList.getEventString(); @@ -86,6 +90,7 @@ void AnnounceListTest::testMultiElementList() { // [ [ tracker1, tracker2, tracker3 ] ] AnnounceList announceList(announces); + CPPUNIT_ASSERT(!announceList.allTiersFailed()); string url = announceList.getAnnounce(); CPPUNIT_ASSERT_EQUAL(string("tracker1"), url); announceList.announceFailure(); @@ -102,8 +107,11 @@ void AnnounceListTest::testMultiElementList() { url = announceList.getAnnounce(); CPPUNIT_ASSERT_EQUAL(string("tracker3"), url); announceList.announceFailure(); - url = announceList.getAnnounce(); + CPPUNIT_ASSERT(announceList.allTiersFailed()); + announceList.resetTier(); + CPPUNIT_ASSERT(!announceList.allTiersFailed()); // back to the first list because there is no other list. + url = announceList.getAnnounce(); CPPUNIT_ASSERT_EQUAL(string("tracker2"), url); } |