From: Daira Hopwood Date: Thu, 3 Sep 2015 19:21:54 +0000 (+0100) Subject: WIP X-Git-Url: https://git.rkrishnan.org/reedownlee?a=commitdiff_plain;h=48418f4700ed211f88f4b02fec033180bef62788;p=tahoe-lafs%2Ftahoe-lafs.git WIP Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/client.py b/src/allmydata/client.py index ec88c7f8..22720a8b 100644 --- a/src/allmydata/client.py +++ b/src/allmydata/client.py @@ -500,6 +500,7 @@ class Client(node.Node, pollmixin.PollMixin): "See docs/frontends/magic-folder.rst for more information.") if self.get_config("magic_folder", "enabled", False, boolean=True): + print "magic folder enabled" upload_dircap = self.get_private_config("magic_folder_dircap") collective_dircap = self.get_private_config("collective_dircap") diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index ecb08a6a..7c21a087 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -105,9 +105,8 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual d = self.create_invite_join_magic_folder(u"Alice", self.local_dir) d.addCallback(self._restart_client) - d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.dirs_monitored'), 1)) + d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.dirs_monitored'), 2)) # why 2?? d.addBoth(self.cleanup) - d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.dirs_monitored'), 0)) return d def test_move_tree(self): diff --git a/src/allmydata/util/deferredutil.py b/src/allmydata/util/deferredutil.py index 4f148c68..08b7d679 100644 --- a/src/allmydata/util/deferredutil.py +++ b/src/allmydata/util/deferredutil.py @@ -113,6 +113,7 @@ class HookMixin: 'res' is returned so that the current result or failure will be passed through. """ + print "calling hook %r" % (name,) hook = self._hooks[name] if hook is None: return defer.succeed(None)