diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index bf3f1a1f6..8eace2aa9 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -460,16 +460,17 @@ class Downloader(QueueMixin): self._download_scan_batch[name] = [(file_node, metadata)] def _scan_remote(self, nickname, dirnode): + print "------------------_scan_remote----------------------" d = dirnode.list() def scan_listing(listing_map): for name in listing_map.keys(): file_node, metadata = listing_map[name] local_version = self._get_local_latest(name) remote_version = metadata.get('version', None) - #print "%r has local version %r, remote version %r" % (name, local_version, remote_version) + print "%r has local version %r, remote version %r" % (name, local_version, remote_version) if local_version is None or remote_version is None or local_version < remote_version: + print "added to download queue\n" self._append_to_batch(name, file_node, metadata) - d.addCallback(scan_listing) return d diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index 47d740f62..39ecb8a39 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -325,12 +325,12 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix # XXX are these used? (self.alice_collective_dircap, self.alice_upload_dircap, self.alice_magicfolder, self.bob_collective_dircap, self.bob_upload_dircap, self.bob_magicfolder) = result - #print "Alice magicfolderdb is at %r" % (self.alice_magicfolder._client.basedir) - #print "Bob magicfolderdb is at %r" % (self.bob_magicfolder._client.basedir) + print "Alice magicfolderdb is at %r" % (self.alice_magicfolder._client.basedir) + print "Bob magicfolderdb is at %r" % (self.bob_magicfolder._client.basedir) d.addCallback(get_results) def Alice_write_a_file(result): - #print "Alice writes a file\n" + print "Alice writes a file\n" self.file_path = abspath_expanduser_unicode(u"file1", base=self.alice_magicfolder.uploader._local_path_u) fileutil.write(self.file_path, "meow, meow meow. meow? meow meow! meow.") self.magicfolder = self.alice_magicfolder @@ -339,7 +339,7 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix d.addCallback(Alice_write_a_file) def Alice_wait_for_upload(result): - #print "Alice waits for an upload\n" + print "Alice waits for an upload\n" d2 = self.alice_magicfolder.uploader.set_hook('processed') return d2 d.addCallback(Alice_wait_for_upload) @@ -352,7 +352,7 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.directories_created', client=self.alice_magicfolder._client), 0)) def Bob_wait_for_download(result): - #print "Bob waits for a download\n" + print "Bob waits for a download\n" d2 = self.bob_magicfolder.downloader.set_hook('processed') return d2 d.addCallback(Bob_wait_for_download) @@ -363,7 +363,7 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix # test deletion of file behavior def Alice_delete_file(result): - #print "Alice deletes the file!\n" + print "Alice deletes the file!\n" os.unlink(self.file_path) self.notify(to_filepath(self.file_path), self.inotify.IN_DELETE) @@ -381,7 +381,7 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix def Alice_rewrite_file(result): - #print "Alice rewrites file\n" + print "Alice rewrites file\n" self.file_path = abspath_expanduser_unicode(u"file1", base=self.alice_magicfolder.uploader._local_path_u) fileutil.write(self.file_path, "Alice suddenly sees the white rabbit running into the forest.") self.magicfolder = self.alice_magicfolder