r177 - /debtorrent/trunk/test.py

[camrdale-guest at users.alioth.debian.org]

Author: camrdale-guest
Date: Mon Jul 16 18:08:42 2007
New Revision: 177

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=177
Log:
Update the test to work with the new scripts.

Modified:
    debtorrent/trunk/test.py

Modified: debtorrent/trunk/test.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/test.py?rev=177&op=diff
==============================================================================
--- debtorrent/trunk/test.py (original)
+++ debtorrent/trunk/test.py Mon Jul 16 18:08:42 2007
@@ -37,11 +37,12 @@
 """
 
 from time import sleep, time
-import btlaunchmany
 from DebTorrent.BT1.track import track
 from DebTorrent.__init__ import resetPeerIDs
 import sys, os, signal
 from traceback import print_exc
+
+DebTorrentClient = __import__('debtorrent-client', globals(), locals(), [])
 
 tests = {'1': ('Start a single tracker and downloader, test updating and downloading ' +
              'using the HTTPDownloader.',
@@ -463,12 +464,13 @@
     # Reset the peer ID so it will be different
     resetPeerIDs()
 
-    pid = start(btlaunchmany.run, ['--cache_dir', downloader_dir,
-                                   '--download_dir', downloader_dir,
-                                   '--apt_port', str(num_down) + '988', 
-                                   '--max_upload_rate', '100',
-                                   '--minport', '1' + str(num_down) + '000', 
-                                   '--maxport', '1' + str(num_down) + '999'] + options,
+    pid = start(DebTorrentClient.run, ['--cache_dir', downloader_dir,
+                                       '--download_dir', downloader_dir,
+                                       '--security', '0',
+                                       '--apt_port', str(num_down) + '988', 
+                                       '--max_upload_rate', '100',
+                                       '--minport', '1' + str(num_down) + '000', 
+                                       '--maxport', '1' + str(num_down) + '999'] + options,
                 downloader_dir)
     return pid