Merge pull request #103 from NielsZeilemaker/devel

Devel
Tribler · Apr 19, 2013 · 01d5bca · 01d5bca
2 parents cb75a6a + 4843bdb
commit 01d5bca
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/Tribler/Core/Libtorrent/LibtorrentMgr.py b/Tribler/Core/Libtorrent/LibtorrentMgr.py
@@ -41,11 +41,6 @@ def __init__(self, trsession, utility):
         self.set_download_rate_limit(-1)
         self.ltsession.start_upnp()
 
-        # Load metadata extension
-        self.ltsession.add_extension(lt.create_metadata_plugin)
-        self.ltsession.add_extension(lt.create_ut_metadata_plugin)
-        self.ltsession.add_extension(lt.create_smart_ban_plugin)
-
         # Start DHT
         try:
             dht_state = open(os.path.join(self.trsession.get_state_dir(), DHTSTATE_FILENAME)).read()

diff --git a/Tribler/Test/test_libtorrent_download.py b/Tribler/Test/test_libtorrent_download.py
@@ -128,7 +128,7 @@ def do_vod():
     def startTest(self, callback):
         def wait_for_libtorrent():
             ltmgr = LibtorrentMgr.getInstance()
-            self.CallConditional(120, lambda: ltmgr.get_dht_nodes() > 100, callback)
+            self.CallConditional(120, lambda: ltmgr.get_dht_nodes() > 25, callback)
 
         TestGuiAsServer.startTest(self, wait_for_libtorrent)