From 48ae3e0be5a65fb78772d871309d9753a54acbe3 Mon Sep 17 00:00:00 2001 From: David Stainton Date: Tue, 1 Sep 2015 14:35:03 +0200 Subject: [PATCH] Revert "Attempt to fix test_persistence" This reverts commit 257d6665d29454351886d9c1125d214b21c324f7. --- src/allmydata/frontends/magic_folder.py | 5 ----- src/allmydata/test/test_magic_folder.py | 16 +++++----------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 48573367..16c5aa40 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -395,11 +395,6 @@ class Downloader(QueueMixin): self._download_scan_batch = {} # path -> [(filenode, metadata)] def start_scanning(self): - print "start_scanning----\n" - all_files = self._db.get_all_files() - print "---------------------" - print "all files in magic folder db: %s\n" % all_files - print "---------------------" d = self._scan_remote_collective() self._turn_deque() return d diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index 6b2154eb..39ecb8a3 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -209,31 +209,25 @@ class MagicFolderTestMixin(MagicFolderTestMixin, ShouldFailMixin, ReallyEqualMix d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_queued'), 0)) def restart(ignore): - print "restart" + #print "restart" tahoe_config_file = os.path.join(self.get_clientdir(), "tahoe.cfg") tahoe_config = fileutil.read(tahoe_config_file) d3 = defer.succeed(None) def write_config(client_node_dir): - print "write_config" + #print "write_config" fileutil.write(os.path.join(client_node_dir, "tahoe.cfg"), tahoe_config) def setup_stats(result): - print "setup_stats" + #print "setup_stats" self.client = None self.set_up_grid(client_config_hooks={0: write_config}) self.client = self.g.clients[0] self.stats_provider = self.client.stats_provider self.magicfolder = self.client.getServiceNamed("magic-folder") - #dbfile = abspath_expanduser_unicode(u"magicfolderdb.sqlite", base=self.basedir) - #self.magicfolder = MagicFolder(self.client, self.upload_dircap, self.collective_dircap, self.local_dir, - # dbfile, inotify=self.inotify, pending_delay=0.2) - self.magicfolder.setServiceParent(self.client) - self.magicfolder.ready() - - #d3.addBoth(self.cleanup) + d3.addBoth(self.cleanup) d3.addCallback(setup_stats) + #d3.addCallback(self._create_magicfolder) return d3 - d.addBoth(self.cleanup) d.addCallback(restart) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_succeeded'), 0)) d.addCallback(lambda ign: self.failUnlessReallyEqual(self._get_count('uploader.objects_queued'), 0)) -- 2.45.2