From: David Stainton Date: Tue, 30 Jun 2015 23:03:28 +0000 (-0700) Subject: Add test for Bob download callback X-Git-Url: https://git.rkrishnan.org/Site/Content/Exhibitors/class-simplejson.JSONDecoder.html?a=commitdiff_plain;h=8446efe9be35c057d20ee77049ce942887372ea2;p=tahoe-lafs%2Ftahoe-lafs.git Add test for Bob download callback --- diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index 190b1918..59ef855c 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -333,14 +333,24 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual self.alice_magicfolder.set_processed_callback(d2.callback, ignore_count=0) return d2 d.addCallback(wait_for_upload) - def prepare_for_stats(result): + def prepare_for_alice_stats(result): self.stats_provider = self.alice_magicfolder._client.stats_provider - d.addCallback(prepare_for_stats) + d.addCallback(prepare_for_alice_stats) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('magic_folder.objects_succeeded'), 1)) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('magic_folder.files_uploaded'), 1)) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('magic_folder.objects_queued'), 0)) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('magic_folder.directories_created'), 0)) + def wait_for_download(result): + d2 = defer.Deferred() + self.bob_magicfolder.set_download_callback(d2.callback, ignore_count=0) + return d2 + d.addCallback(wait_for_download) + def prepare_for_bob_stats(result): + self.stats_provider = self.bob_magicfolder._client.stats_provider + d.addCallback(prepare_for_bob_stats) + d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('magic_folder.objects_succeeded'), 1)) + def cleanup_Alice_and_Bob(result): d = defer.succeed(None) d.addCallback(lambda ign: self.alice_magicfolder.finish(for_tests=True))