From 034f9910b4efd20cb8f829d2229036000a5b0e5b Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 2 Nov 2015 18:21:52 +0000 Subject: [PATCH] WIP debugging and partial fix. Signed-off-by: Daira Hopwood --- src/allmydata/frontends/magic_folder.py | 6 ++++-- src/allmydata/test/test_magic_folder.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 9f5af702..09b646d9 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -357,7 +357,8 @@ class Uploader(QueueMixin): self._notifier.watch(fp, mask=self.mask, callbacks=[self._notify], recursive=True) uploadable = Data("", self._client.convergence) - encoded_path_u += magicpath.path2magic(u"/") + _assert(encoded_path_u.endswith(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 +522,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 +661,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 1e8f8993..08cebd76 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -593,6 +593,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') @@ -627,9 +628,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)) -- 2.45.2