ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-22 08:50:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bob's uploading test...

Browse Source
This commit is contained in:
David Stainton
2015-10-27 09:18:50 +01:00
committed by Brian Warner
parent 890e4622b9
commit ee3d9b19be
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/test/test_magic_folder.py
View File

@ -696,8 +696,12 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
return downloaded_d return downloaded_d
def _wait_for(ign, something_to_do, alice=True): def _wait_for(ign, something_to_do, alice=True):
downloaded_d = self.bob_magicfolder.downloader.set_hook('processed') if alice:
uploaded_d = self.alice_magicfolder.uploader.set_hook('processed') downloaded_d = self.bob_magicfolder.downloader.set_hook('processed')
uploaded_d = self.alice_magicfolder.uploader.set_hook('processed')
else:
downloaded_d = self.alice_magicfolder.downloader.set_hook('processed')
uploaded_d = self.bob_magicfolder.uploader.set_hook('processed')
something_to_do() something_to_do()
if alice: if alice:
print "Waiting for Alice to upload\n" print "Waiting for Alice to upload\n"
@ -799,14 +803,17 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual
d.addCallback(lambda ign: _check_downloader_count(None, 'objects_excluded', self.objects_excluded+1)) d.addCallback(lambda ign: _check_downloader_count(None, 'objects_excluded', self.objects_excluded+1))
d.addCallback(_check_downloader_count, 'objects_downloaded', 3) d.addCallback(_check_downloader_count, 'objects_downloaded', 3)
# XXX # XXX
def Bob_to_rewrite_file(): def Bob_to_rewrite_file():
print "Bob rewrites file\n" print "Bob rewrites file\n"
self.file_path = abspath_expanduser_unicode(u"file1", base=self.bob_magicfolder.uploader._local_path_u) self.file_path = abspath_expanduser_unicode(u"file2", base=self.bob_magicfolder.uploader._local_path_u)
print "---- bob's file is %r" % (self.file_path,)
fileutil.write(self.file_path, "No white rabbit to be found.") fileutil.write(self.file_path, "No white rabbit to be found.")
self.magicfolder = self.bob_magicfolder
self.notify(to_filepath(self.file_path), self.inotify.IN_CLOSE_WRITE) self.notify(to_filepath(self.file_path), self.inotify.IN_CLOSE_WRITE)
d.addCallback(lambda ign: _wait_for(ign, Bob_to_rewrite_file, alice=False)) d.addCallback(lambda ign: _wait_for(None, Bob_to_rewrite_file, alice=False))
def _cleanup(ign, magicfolder, clock): def _cleanup(ign, magicfolder, clock):
if magicfolder is not None: if magicfolder is not None: