From: Daira Hopwood Date: Mon, 2 Nov 2015 22:10:55 +0000 (+0000) Subject: Debugging WIP. X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=7acc3e2c68447b1be265a7cf6a4387c2129acb15;p=tahoe-lafs%2Ftahoe-lafs.git Debugging WIP. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 9f5af702..4e0143b3 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -123,6 +123,7 @@ class QueueMixin(HookMixin): self._turn_delay = 0 def _get_filepath(self, relpath_u): + self._log("_get_filepath(%r)" % (relpath_u,)) return extend_filepath(self._local_filepath, relpath_u.split(u"/")) def _get_relpath(self, filepath): @@ -358,6 +359,7 @@ class Uploader(QueueMixin): uploadable = Data("", self._client.convergence) encoded_path_u += magicpath.path2magic(u"/") + self._log("encoded_path_u = %r" % (encoded_path_u,)) upload_d = self._upload_dirnode.add_file(encoded_path_u, uploadable, metadata={"version":0}, overwrite=True) def _succeeded(ign): self._log("created subdirectory %r" % (relpath_u,)) @@ -521,6 +523,7 @@ class Downloader(QueueMixin, WriteFileMixin): self._log("all files %s" % files) d = self._scan_remote_collective() + d.addBoth(self._logcb, "after _scan_remote_collective 0") self._turn_deque() return d @@ -659,7 +662,7 @@ class Downloader(QueueMixin, WriteFileMixin): def _when_queue_is_empty(self): d = task.deferLater(self._clock, self._turn_delay, self._scan_remote_collective) - d.addBoth(self._logcb, "after _scan_remote_collective") + d.addBoth(self._logcb, "after _scan_remote_collective 1") d.addCallback(lambda ign: self._turn_deque()) return d diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index c00ccac6..cacb1804 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -598,6 +598,7 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual def _check_file(self, name_u, data, temporary=False, directory=False): precondition(not (temporary and directory), temporary=temporary, directory=directory) + print "%r._check_file(%r, %r, temporary=%r, directory=%r)" % (self, name_u, data, temporary, directory) previously_uploaded = self._get_count('uploader.objects_succeeded') previously_disappeared = self._get_count('uploader.objects_disappeared') @@ -632,9 +633,18 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_disappeared'), previously_disappeared + 1)) else: + def _here(res, n): + print "here %r %r" % (n, res) + return res + d.addBoth(_here, 1) + d.addCallback(lambda ign: self.upload_dirnode.list()) + d.addBoth(_here, 1.5) d.addCallback(lambda ign: self.upload_dirnode.get(encoded_name_u)) + d.addBoth(_here, 2) d.addCallback(download_to_data) + d.addBoth(_here, 3) d.addCallback(lambda actual_data: self.failUnlessReallyEqual(actual_data, data)) + d.addBoth(_here, 4) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_succeeded'), previously_uploaded + 1))