dbfile = abspath_expanduser_unicode(u"magicfolderdb.sqlite", base=self.get_clientdir(i=client_num))
magicfolder = MagicFolder(self.get_client(client_num), upload_dircap, collective_dircap, local_magic_dir,
dbfile, pending_delay=0.2, clock=clock)
+ magicfolder.downloader._turn_delay = 0
+
+ orig = magicfolder.uploader._append_to_deque
+ # the _append_to_deque method queues a _turn_deque, so we
+ # immediately trigger it by wrapping _append_to_deque
+ def wrap(*args, **kw):
+ x = orig(*args, **kw)
+ clock.advance(0) # _turn_delay is always 0 for the tests
+ return x
+ magicfolder.uploader._append_to_deque = wrap
+
magicfolder.setServiceParent(self.get_client(client_num))
magicfolder.ready()
return magicfolder
- def setup_alice_and_bob(self, clock=reactor):
+ def setup_alice_and_bob(self, alice_clock=reactor, bob_clock=reactor):
self.set_up_grid(num_clients=2)
alice_magic_dir = abspath_expanduser_unicode(u"Alice-magic", base=self.basedir)
d.addCallback(lambda x: self.check_joined_config(0, self.alice_upload_dircap))
d.addCallback(lambda x: self.check_config(0, alice_magic_dir))
def get_Alice_magicfolder(result):
- self.alice_magicfolder = self.init_magicfolder(0, self.alice_upload_dircap, self.alice_collective_dircap, alice_magic_dir, clock)
+ self.alice_magicfolder = self.init_magicfolder(0, self.alice_upload_dircap, self.alice_collective_dircap, alice_magic_dir, alice_clock)
return result
d.addCallback(get_Alice_magicfolder)
d.addCallback(lambda x: self.check_joined_config(1, self.bob_upload_dircap))
d.addCallback(lambda x: self.check_config(1, bob_magic_dir))
def get_Bob_magicfolder(result):
- self.bob_magicfolder = self.init_magicfolder(1, self.bob_upload_dircap, self.bob_collective_dircap, bob_magic_dir, clock)
+ self.bob_magicfolder = self.init_magicfolder(1, self.bob_upload_dircap, self.bob_collective_dircap, bob_magic_dir, bob_clock)
return result
d.addCallback(get_Bob_magicfolder)