From: Daira Hopwood Date: Mon, 14 Sep 2015 17:19:34 +0000 (+0100) Subject: Fix test bug that accidentally suppressed errors. X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/class-simplejson.JSONEncoder.html?a=commitdiff_plain;h=efd882331138bec7e324d43c87c6d9b7045b50c9;p=tahoe-lafs%2Ftahoe-lafs.git Fix test bug that accidentally suppressed errors. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index 95302b3f..d9dfff0b 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -211,8 +211,9 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual self.notify(to_filepath(test_file), self.inotify.IN_CLOSE_WRITE) return d2 d.addCallback(lambda ign: create_test_file(ign, u"what1")) - def fu(ign): + def fu(res): print "upload complete" + return res d.addBoth(fu) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_succeeded'), 1)) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_queued'), 0)) @@ -222,8 +223,9 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_queued'), 0)) d.addCallback(lambda ign: create_test_file(ign, u"what2")) - def fu2(ign): + def fu2(res): print "2nd upload complete" + return res d.addBoth(fu2) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_succeeded'), 2))