X-Git-Url: https://git.mxchange.org/?p=quix0rs-apt-p2p.git;a=blobdiff_plain;f=test.py;h=5a67d2f3628ab588a50bb06c3fce90728e9d6377;hp=b94e01249d2356664fed8168a8e3c6e1ea1493d4;hb=HEAD;hpb=05422476cb06c6ccd2def7709a251e618e1eafb3 diff --git a/test.py b/test.py index b94e012..5a67d2f 100755 --- a/test.py +++ b/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python """Automated tests of the apt-p2p functionality. @@ -29,7 +29,8 @@ the apt-p2p program. @var CWD: the working directory the script was run from @type apt_conf_template: C{string} @var apt_conf_template: the template to use for the apt.conf file - +@type apt_p2p_conf_template: C{string} +@var apt_p2p_conf_template: the template to use for the apt-p2p.conf file """ from time import sleep, time @@ -47,7 +48,6 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl (1, ['install', 'ada-reference-manual']), (1, ['install', 'aspectj-doc']), (1, ['install', 'fop-doc']), - (1, ['install', 'asis-doc']), (1, ['install', 'bison-doc']), (1, ['install', 'crash-whitepaper']), ]), @@ -165,9 +165,9 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl {1: {}}, [(1, ['update']), (1, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', @@ -184,54 +184,54 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl 6: {}}, [(1, ['update']), (1, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', ]), (2, ['update']), (2, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', ]), (3, ['update']), (3, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', ]), (4, ['update']), (4, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', ]), (5, ['update']), (5, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', ]), (6, ['update']), (6, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', @@ -266,9 +266,9 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl {1: {'clean': False}, 2: {'clean': False}}, [(1, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', @@ -276,25 +276,25 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl (1, ['update']), (1, ['update']), (1, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', ]), (1, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', ]), (2, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', @@ -302,17 +302,17 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl (2, ['update']), (2, ['update']), (2, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', ]), (2, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', @@ -346,14 +346,14 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl [(1, ['update']), (1, ['install', 'aboot-base', 'ada-reference-manual', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'apt-howto-common', 'aptitude-doc-en', 'asr-manpages', + 'aptitude-doc-en', 'asr-manpages', 'alcovebook-sgml-doc', 'airstrike-common', ]), (2, ['update']), (2, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual', - 'aspectj-doc', 'fop-doc', 'asis-doc', + 'aspectj-doc', 'fop-doc', 'bison-doc', 'crash-whitepaper', - 'bash-doc', 'apt-howto-common', 'autotools-dev', + 'autotools-dev', 'aptitude-doc-en', 'asr-manpages', 'atomix-data', 'alcovebook-sgml-doc', 'afbackup-common', 'airstrike-common', @@ -466,7 +466,7 @@ UNLOAD_PACKAGES_CACHE = 5m # Refresh the DHT keys after this much time has passed. # This should be a time slightly less than the DHT's KEY_EXPIRE value. -KEY_REFRESH = 57m +KEY_REFRESH = 2.5h # The user name to try and run as (leave blank to run as current user) USERNAME = @@ -490,10 +490,10 @@ BOOTSTRAP_NODE = %(BOOTSTRAP_NODE)s CHECKPOINT_INTERVAL = 5m # concurrent xmlrpc calls per find node/value request! -CONCURRENT_REQS = 4 +CONCURRENT_REQS = 8 # how many hosts to post to -STORE_REDUNDANCY = 3 +STORE_REDUNDANCY = 6 # How many values to attempt to retrieve from the DHT. # Setting this to 0 will try and get all values (which could take a while if @@ -512,18 +512,23 @@ MIN_PING_INTERVAL = 15m # refresh buckets that haven't been touched in this long BUCKET_STALENESS = 1h +# Whether it's OK to add nodes to the routing table that use an IP +# address from a known local/private range. +# If not specified here, the LOCAL_OK value in the DEFAULT section will be used. +LOCAL_OK = yes + # expire entries older than this -KEY_EXPIRE = 1h +KEY_EXPIRE = 3h # Timeout KRPC requests to nodes after this time. -KRPC_TIMEOUT = 14s +KRPC_TIMEOUT = 9s # KRPC requests are resent using exponential backoff starting with this delay. # The request will first be resent after the delay set here. # The request will be resent again after twice the delay set here. etc. -# e.g. if TIMEOUT is 14 sec., and INITIAL_DELAY is 2 sec., then requests will +# e.g. if TIMEOUT is 9 sec., and INITIAL_DELAY is 2 sec., then requests will # be resent at times 0, 2 (2 sec. later), and 6 (4 sec. later), and then will -# timeout at 14. +# timeout at 9. KRPC_INITIAL_DELAY = 2s # whether to spew info about the requests/responses in the protocol