Make downloader delay a class-variable

This gives the integration-style CLI-based tests a chance
to set the delay to 0 before the first 3-second delayed
call is queued to _lazy_tail in the Downloader
This commit is contained in:
meejah 2015-10-07 20:32:19 -06:00 committed by Brian Warner
parent 9aecfed421
commit 94a2ef0095
2 changed files with 4 additions and 1 deletions
src/allmydata

View File

@ -378,6 +378,8 @@ class Uploader(QueueMixin):
class Downloader(QueueMixin):
REMOTE_SCAN_INTERVAL = 3 # facilitates tests
def __init__(self, client, local_path_u, db, collective_dircap, clock):
QueueMixin.__init__(self, client, local_path_u, db, 'downloader', clock)
@ -389,7 +391,7 @@ class Downloader(QueueMixin):
if self._collective_dirnode.is_unknown() or not self._collective_dirnode.is_readonly():
raise AssertionError("The URI in 'private/collective_dircap' is not a readonly cap to a directory.")
self._turn_delay = 3 # delay between remote scans
self._turn_delay = self.REMOTE_SCAN_INTERVAL
self._download_scan_batch = {} # path -> [(filenode, metadata)]
def start_scanning(self):

View File

@ -31,6 +31,7 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
temp = self.mktemp()
self.basedir = abspath_expanduser_unicode(temp.decode(get_filesystem_encoding()))
self.magicfolder = None
Downloader.REMOTE_SCAN_INTERVAL = 0
def _get_count(self, name, client=None):
counters = (client or self.get_client()).stats_provider.get_stats()["counters"]