From f0f478195d23042cc93da0c3e270580b2f7319a5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 8 Mar 2019 11:43:18 -0500 Subject: [PATCH] Fix Eliot logging for setUp --- src/allmydata/test/test_magic_folder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index 5b871f4e5..83ba4abbc 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -1477,10 +1477,10 @@ class SingleMagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Reall from foolscap.eventual import flushEventualQueue self.addCleanup(flushEventualQueue) - d = self.create_invite_join_magic_folder(self.alice_nickname, self.local_dir) + d = DeferredContext(self.create_invite_join_magic_folder(self.alice_nickname, self.local_dir)) d.addCallback(self._restart_client) # note: _restart_client ultimately sets self.magicfolder to not-None - return d + return d.result def tearDown(self): d = super(SingleMagicFolderTestMixin, self).tearDown()