From d77dd9038c6d12991e12908324f39a12d3283a67 Mon Sep 17 00:00:00 2001 From: David Stainton Date: Mon, 31 Aug 2015 23:38:55 +0200 Subject: [PATCH] Attempt to fix test_persistence broken WIP, startup path was broken --- src/allmydata/frontends/magic_folder.py | 5 +++++ src/allmydata/test/test_magic_folder.py | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index c6a00511..2557fb73 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -395,6 +395,11 @@ 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 39ecb8a3..6b2154eb 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -209,25 +209,31 @@ 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") - d3.addBoth(self.cleanup) + #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.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