More work on the TODO.

[quix0rs-apt-p2p.git] / test.py

diff --git a/test.py b/test.py
index f66c7fbc544074a805f2f63b6db6e2956f80ad18..d2dece48e0d14087472d40a1fd189fe598301ce6 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -59,15 +59,15 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl
                {1: {},
                 2: {}},
                [(1, ['update']),
+                (2, ['update']),
                 (1, ['install', 'aboot-base']),
+                (2, ['install', 'aboot-base']),
                 (1, ['install', 'aap-doc']),
                 (1, ['install', 'ada-reference-manual']),
                 (1, ['install', 'fop-doc']),
                 (1, ['install', 'jswat-doc']),
                 (1, ['install', 'bison-doc']),
                 (1, ['install', 'crash-whitepaper']),
-                (2, ['update']),
-                (2, ['install', 'aboot-base']),
                 (2, ['install', 'aap-doc']),
                 (2, ['install', 'ada-reference-manual']),
                 (2, ['install', 'fop-doc']),
@@ -511,7 +511,7 @@ def apt_get(num_down, cmd):
     
     """
     
-    print '************************** apt-get (' + str(num_down) + ') ' + ' '.join(cmd) + ' **************************'
+    print '*************** apt-get (' + str(num_down) + ') ' + ' '.join(cmd) + ' ****************'
     apt_conf = join([down_dir(num_down), 'etc', 'apt', 'apt.conf'])
     dpkg_status = join([down_dir(num_down), 'var', 'lib', 'dpkg', 'status'])
     args = ['-d', '-c', apt_conf, '-o', 'Dir::state::status='+dpkg_status] + cmd
@@ -735,9 +735,9 @@ def run_test(bootstraps, downloaders, apt_get_queue):
             apt_get_results.append((elapsed, r_value))
 
             if r_value == 0:
-                print '********************** apt-get completed successfully in ' +  str(elapsed) + ' sec. **************************'
+                print '********** apt-get completed successfully in ' +  str(elapsed) + ' sec. *****************'
             else:
-                print '********************** apt-get finished with status ' + str(r_value) + ' in ' +  str(elapsed) + ' sec. **************************'
+                print '********** apt-get finished with status ' + str(r_value) + ' in ' +  str(elapsed) + ' sec. ************'
         
             sleep(5)