From: David Stainton Date: Fri, 31 Jul 2015 18:09:30 +0000 (-0700) Subject: add version checking to alice bob test X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=fc29140793b77b13c7d8364a36fe0b850a5c0a89;p=tahoe-lafs%2Ftahoe-lafs.git add version checking to alice bob test --- diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index 1007f733..e6490e39 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -360,9 +360,11 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix self.bob_magicfolder.downloader.set_callback(d2.callback) return d2 d.addCallback(Bob_wait_for_download) - #d.addCallback(lambda ign: self._check_version_in_local_db(self.bob_magicfolder, u"file1", 0)) + d.addCallback(lambda ign: self._check_version_in_local_db(self.bob_magicfolder, u"file1", 0)) + d.addCallback(lambda ign: self._check_version_in_dmd(self.bob_magicfolder, u"file1", 0)) # XXX prolly not needed d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('downloader.objects_downloaded', client=self.bob_magicfolder._client), 1)) + # test deletion of file behavior def Alice_delete_file(result): print "Alice deletes the file!\n" @@ -373,8 +375,14 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix d.addCallback(Alice_delete_file) d.addCallback(Alice_wait_for_upload) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_succeeded', client=self.alice_magicfolder._client), 2)) + d.addCallback(lambda ign: self._check_version_in_local_db(self.alice_magicfolder, u"file1", 1)) + d.addCallback(lambda ign: self._check_version_in_dmd(self.alice_magicfolder, u"file1", 1)) + d.addCallback(Bob_wait_for_download) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('downloader.objects_downloaded', client=self.bob_magicfolder._client), 2)) + d.addCallback(lambda ign: self._check_version_in_local_db(self.bob_magicfolder, u"file1", 1)) + d.addCallback(lambda ign: self._check_version_in_dmd(self.bob_magicfolder, u"file1", 1)) + def Alice_rewrite_file(result): print "Alice rewrites file\n"